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: 1e0951b360f4b2a283187932fec3867c3477e25d
+  newTag: 8a59933310d4244f8935a207c0966a40eb3327ed

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

@@ -298,8 +298,9 @@ public class FlyerTrainingServiceImpl implements FlyerTrainingService {
         if(objects.contains("1")){
             if(tempTotalAmount.compareTo(userCashAmt) <= 0){
                 curriculumOrderLogVO.setCashAmtPaid(tempTotalAmount);
-                tempTotalAmount = BigDecimal.ZERO;
                 userCashAmt = tempTotalAmount;
+                userSalaryAmt = BigDecimal.ZERO;
+                tempTotalAmount = BigDecimal.ZERO;
             }else{
                 curriculumOrderLogVO.setCashAmtPaid(userCashAmt);
                 tempTotalAmount = tempTotalAmount.subtract(userCashAmt);