Requirements(update)

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

@@ -769,11 +769,14 @@ public class RequirementsServiceImpl implements RequirementsService {
         publisherWalletFlowVO.setSalaryAmount(infoDO.getSalaryAmount());
         publisherWalletFlowVO.setCashAmount(infoDO.getCashAmount());
         //退云享金和佣金
-       /* if (infoDO.getOrderLevel().equals("RUSH_ORDER")) {
-            publisherWalletFlowVO.setUrgentSalaryAmount();
-            publisherWalletFlowVO.setUrgentSalaryAmount();
-        }*/
-
+        if (infoDO.getOrderLevel().equals("RUSH_ORDER")) {
+            publisherWalletFlowVO.setUrgentYxjAmount(infoDO.getLevelCashAmount());
+            publisherWalletFlowVO.setUrgentSalaryAmount(infoDO.getLevelSalaryAmount());
+        }
+        if (infoDO.getOrderLevel().equals("TOP_ORDER")) {
+            publisherWalletFlowVO.setTopYxjAmount(infoDO.getLevelCashAmount());
+            publisherWalletFlowVO.setTopSalaryAmount(infoDO.getLevelSalaryAmount());
+        }
 
         walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
         //给发布者微信退钱
@@ -989,6 +992,9 @@ public class RequirementsServiceImpl implements RequirementsService {
         if (requirementsInfoDO == null) {
             return ResultBody.error("当前订单不存在");
         }
+        if (requirementsInfoDO.getServiceFlowId() == 7) {
+            return ResultBody.error("已取消请不要重复取消");
+        }
         IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
         Integer serviceFlowId = requirementsInfoDO.getServiceFlowId();
         ApplyRefundVO applyRefundVO = new ApplyRefundVO();
@@ -1008,7 +1014,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
                 publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount());
                 walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
-                flyerCancel(walletFlowVO, request.getHeader("token"));
+                // flyerCancel(walletFlowVO, request.getHeader("token"));
             }
             if (requirementsInfoDO.getWechatPayOrderNumber() != null
                     && requirementsInfoDO.getWeChat().compareTo(BigDecimal.ZERO) != 0) {
@@ -1062,14 +1068,23 @@ public class RequirementsServiceImpl implements RequirementsService {
                 BigDecimal returnToWechat = residueOrderAmount.subtract(requirementsInfoDO.getWeChat());
                 //退回佣金
                 BigDecimal residueAmount = returnToWechat.subtract(requirementsInfoDO.getSalaryAmount());
+
                 if (residueAmount.compareTo(BigDecimal.ZERO) == 0
                         || residueAmount.compareTo(BigDecimal.ZERO) == -1) {
                     publisherWalletFlowVO.setUserAccountId(userAccountId);
                     publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
                     publisherWalletFlowVO.setModeOfPayment(300);
-                    publisherWalletFlowVO.setSalaryAmount(residueAmount);
+                    publisherWalletFlowVO.setSalaryAmount(residueAmount.negate());
+                    System.out.println(residueAmount);
+                    BigDecimal subtract = requirementsInfoDO.getSalaryAmount().subtract(residueAmount.negate());
+                    publisherWalletFlowVO.setSalaryCashPledge(subtract.negate());
+                    publisherWalletFlowVO.setYxjCashPledge(requirementsInfoDO.getCashAmount().negate());
+
+                    //  BigDecimal subtract = requirementsInfoDO.getSalaryAmount().subtract(residueAmount.negate());
+                    //  publisherWalletFlowVO.setSalaryCashPledge(subtract.negate());
+
                     walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
-                    flyerCancel(walletFlowVO, request.getHeader("token"));
+                    //flyerCancel(walletFlowVO, request.getHeader("token"));
                     //退回的佣金大于0
                 } else if (residueAmount.compareTo(BigDecimal.ZERO) == 1) {
                     publisherWalletFlowVO.setCashAmount(residueAmount);
@@ -1079,7 +1094,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                     publisherWalletFlowVO.setModeOfPayment(300);
                     walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
                     //退回任务佣金
-                    flyerCancel(walletFlowVO, request.getHeader("token"));
+                    //flyerCancel(walletFlowVO, request.getHeader("token"));
 
                 }
                 BigDecimal weChatAmount = requirementsInfoDO.getWeChat();