RequirementsServiceImpl(update)

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

@@ -716,7 +716,6 @@ public class RequirementsServiceImpl implements RequirementsService {
 
     @Override
     public ResultBody droneFlyerCancel(Integer requirementsInfoId, Integer userAccountId, HttpServletRequest request) {
-
         RequirementsInfoDO infoDO = requirementsDao.publisherCancelFlyer(requirementsInfoId);
         RequirementsServiceDO requirementsServiceDO = requirementsDao.droneFlyerCancel(requirementsInfoId, userAccountId);
         IsNullConvertZeroUtil.checkIsNull(requirementsServiceDO);
@@ -751,15 +750,15 @@ public class RequirementsServiceImpl implements RequirementsService {
             BigDecimal subtract = preemptTotalAmount.subtract(requirementsServiceDO.getWeChat());
             if (requirementsServiceDO.getSalaryAmount().compareTo(subtract) == -1) {
                 BigDecimal sub2 = subtract.subtract(requirementsServiceDO.getSalaryAmount());
-                flyerWalletFlowVO.setSalaryCashPledge(requirementsServiceDO.getSalaryAmount());
+                flyerWalletFlowVO.setSalaryCashPledge(requirementsServiceDO.getSalaryAmount().negate());
                 if (sub2.compareTo(requirementsServiceDO.getCashAmount()) == 0 ||
                         sub2.compareTo(requirementsServiceDO.getCashAmount()) == -1) {
                     //云享金扣除违约多少
-                    flyerWalletFlowVO.setYxjCashPledge(sub2);
+                    flyerWalletFlowVO.setYxjCashPledge(sub2.negate());
                 }
             } else if (requirementsServiceDO.getSalaryAmount().compareTo(subtract) == 1 ||
                     requirementsServiceDO.getSalaryAmount().compareTo(subtract) == 0) {
-                flyerWalletFlowVO.setSalaryCashPledge(subtract);
+                flyerWalletFlowVO.setSalaryCashPledge(subtract.negate());
             }
         }
         walletFlowVO.setFlyerWalletFlowVO(flyerWalletFlowVO);
@@ -769,6 +768,12 @@ public class RequirementsServiceImpl implements RequirementsService {
         publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
         publisherWalletFlowVO.setSalaryAmount(infoDO.getSalaryAmount());
         publisherWalletFlowVO.setCashAmount(infoDO.getCashAmount());
+        //退云享金和佣金
+       /* if (infoDO.getOrderLevel().equals("RUSH_ORDER")) {
+            publisherWalletFlowVO.setUrgentSalaryAmount();
+            publisherWalletFlowVO.setUrgentSalaryAmount();
+        }*/
+
 
         walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
         //给发布者微信退钱
@@ -782,7 +787,6 @@ public class RequirementsServiceImpl implements RequirementsService {
         }
         IsNullConvertZeroUtil.checkIsNull(infoDO);
 
-
         //任务佣金
         requirementsServiceDO.setPercentagePenaltyOfOrder(percentagePenaltyOfOrder);
         //飞手单方面取消将20之二十退回到发布者佣金里面
@@ -1098,7 +1102,8 @@ public class RequirementsServiceImpl implements RequirementsService {
 
 
             if (serviceDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
-                    serviceDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
+                    serviceDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0 ||
+                    serviceDO.getWeChat().compareTo(BigDecimal.ZERO) != 0) {
                 System.out.println(freeze);
                 //优先扣除微信
                 BigDecimal weChat1 = requirementsInfoDO.getWeChat();
@@ -1118,7 +1123,6 @@ public class RequirementsServiceImpl implements RequirementsService {
                     }
 
                 }
-
                 //飞手应该获得的金额
                 publisherWalletFlowVO.setUserAccountId(userAccountId);
                 publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
@@ -1131,8 +1135,11 @@ public class RequirementsServiceImpl implements RequirementsService {
                 flyerWalletFlowVO.setModeOfPayment(300);
                 walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
                 walletFlowVO.setFlyerWalletFlowVO(flyerWalletFlowVO);
+                String s = String.valueOf(walletFlowVO);
+                log.info(s);
                 flyerCancel(walletFlowVO, request.getHeader("token"));
             }
+            //飞手全额退款
             if (serviceDO.getWechatPayOrderNumber() != null) {
                 ApplyRefundVO arv = new ApplyRefundVO();
                 arv.setReason("全额退款");