Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/ims into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 7162d642151a36be1c2cfb9892bf1c8cd47fb1c5
+  newTag: d3581a5e295155e39ba88db7ee7e1c547ea1426b

release-service/src/main/java/com/mmc/csf/release/service/impl/FlyerTrainingServiceImpl.java

@@ -279,7 +279,7 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         tempTotalAmount = curriculumInfoDO.getRequireAmout().subtract(weChatPay);
 
         CurriculumOrderDO curriculumOrderDO = new CurriculumOrderDO();
-        curriculumOrderDO.setId(curriculumInfoDO.getId());
+        curriculumOrderDO.setUserAccountId(curriculumInfoDO.getId());
         // 生成支付流水号(规则"CO" + 时间戳 + 用户id + 随机数4位)
         curriculumOrderDO.setOrderNo("CO" + TDateUtil.getDateStr(new Date(), "yyyyMMddHHmmss") + curriculumInfoDO.getId() + CodeUtil.getRandomNum(4));
 
@@ -295,17 +295,22 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         curriculumOrderLogVO.setOrderNo(curriculumOrderDO.getOrderNo());
         curriculumOrderLogVO.setUserAccountId(curriculumPayVO.getId());
         if(objects.contains("1")){
-            if(tempTotalAmount.compareTo(userCashAmt) < 0){
+            if(tempTotalAmount.compareTo(userCashAmt) <= 0){
                 curriculumOrderLogVO.setCashAmtPaid(tempTotalAmount);
-                curriculumOrderLogVO.setSalaryAmtPaid(BigDecimal.ZERO);
+                tempTotalAmount = BigDecimal.ZERO;
+                userCashAmt = tempTotalAmount;
             }else{
                 curriculumOrderLogVO.setCashAmtPaid(userCashAmt);
-                curriculumOrderLogVO.setSalaryAmtPaid(tempTotalAmount.subtract(userCashAmt));
+                tempTotalAmount = tempTotalAmount.subtract(userCashAmt);
             }
-        } else if (objects.contains("2")) {
-            if(tempTotalAmount.compareTo(userSalaryAmt) < 0){
-                curriculumOrderLogVO.setCashAmtPaid(BigDecimal.ZERO);
-                curriculumOrderLogVO.setSalaryAmtPaid(userSalaryAmt.subtract(tempTotalAmount));
+        }
+        if(!objects.contains("2")&& tempTotalAmount.compareTo(BigDecimal.ZERO) > 0){
+            return  ResultBody.error("云享金不够支付,支付失败");
+        }
+        if(objects.contains("2") && tempTotalAmount.compareTo(BigDecimal.ZERO) >= 0) {
+            if(tempTotalAmount.compareTo(userSalaryAmt) <= 0){
+                curriculumOrderLogVO.setSalaryAmtPaid(tempTotalAmount);
+                userSalaryAmt = tempTotalAmount;
             }else{
                 return  ResultBody.error("佣金不够支付,支付失败");
             }