Req(update)

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

@@ -995,6 +995,8 @@ public class RequirementsServiceImpl implements RequirementsService {
             BigDecimal refundCashAmount = new BigDecimal(0);
             BigDecimal refundSalaryAmount = new BigDecimal(0);
             BigDecimal refundWeChat = new BigDecimal(0);
+            //飞手获得的金额
+            BigDecimal receiveSalaryAmount = orderAmount.multiply(new BigDecimal(0.2)).setScale(2, BigDecimal.ROUND_HALF_UP);
             //微信支付金额大于需要退款金额
             if (weChat.compareTo(residueOrderAmount) == 1) {
                 //用户退百分之七十的费用
@@ -1022,6 +1024,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                     publisherWalletFlowVO.setSalaryAmount(residueAmount);
                     walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
                     flyerCancel(walletFlowVO, request.getHeader("token"));
+                    //退回的佣金大于0
                 } else if (residueAmount.compareTo(BigDecimal.ZERO) == 1) {
                     publisherWalletFlowVO.setCashAmount(residueAmount);
                     publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
@@ -1031,6 +1034,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                     walletFlowVO.setPublisherWalletFlowVO(publisherWalletFlowVO);
                     //退回任务佣金
                     flyerCancel(walletFlowVO, request.getHeader("token"));
+
                 }
                 BigDecimal weChatAmount = requirementsInfoDO.getWeChat();
                 long longWeChat = weChatAmount.multiply(new BigDecimal(100)).longValue();
@@ -1039,7 +1043,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                 applyRefundVO.setOutTradeNo(requirementsInfoDO.getWechatPayOrderNumber());
                 applyRefund(applyRefundVO, request.getHeader("token"));
             }
-            BigDecimal receiveSalaryAmount = orderAmount.multiply(new BigDecimal(0.2)).setScale(2, BigDecimal.ROUND_HALF_UP);
+
             //平台抽取百分之十
             //发布者取消
             BigDecimal earnings = orderAmount.multiply(new BigDecimal(0.1)).setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -1053,12 +1057,31 @@ public class RequirementsServiceImpl implements RequirementsService {
 
             if (serviceDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
                     serviceDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
+                System.out.println(receiveSalaryAmount);
+                //优先扣除微信
+                BigDecimal weChat1 = requirementsInfoDO.getWeChat();
+                //如果微信扣除的金额小于飞手获得的钱
+                if (weChat1.compareTo(receiveSalaryAmount) == -1) {
+                    //还需要扣除多少
+                    BigDecimal subtract = receiveSalaryAmount.subtract(weChat1);
+                    if (subtract.compareTo(requirementsInfoDO.getSalaryAmount()) == 1) {
+                        publisherWalletFlowVO.setSalaryCashPledge(requirementsInfoDO.getSalaryAmount().negate());
+                        //
+                        BigDecimal subtract1 = subtract.subtract(requirementsInfoDO.getSalaryAmount());
+                        if (subtract1.compareTo(BigDecimal.ZERO) == 0 || subtract1.compareTo(BigDecimal.ZERO) == 1) {
+                            publisherWalletFlowVO.setYxjCashPledge(subtract1.negate());
+                        }
+                    } else if (subtract.compareTo(requirementsInfoDO.getSalaryAmount()) == -1) {
+                        publisherWalletFlowVO.setSalaryCashPledge(subtract.negate());
+                    }
+
+                }
+
                 //飞手应该获得的金额
                 publisherWalletFlowVO.setUserAccountId(userAccountId);
                 publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
                 publisherWalletFlowVO.setModeOfPayment(300);
                 publisherWalletFlowVO.setPercentagePenaltyOfOrder(receiveSalaryAmount.negate());
-
                 flyerWalletFlowVO.setCashAmount(serviceDO.getCashAmount());
                 flyerWalletFlowVO.setSalaryAmount(serviceDO.getSalaryAmount());
                 flyerWalletFlowVO.setUserAccountId(requirementsInfoDO.getPilotCertificationUserId());