Requirements(update)

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

@@ -1066,8 +1066,18 @@ public class RequirementsServiceImpl implements RequirementsService {
                     weChat.compareTo(refundCashAmount) == 0) {
                 //优先扣除微信里面的钱
                 BigDecimal returnToWechat = residueOrderAmount.subtract(requirementsInfoDO.getWeChat());
-                //退回佣金
-                BigDecimal residueAmount = returnToWechat.subtract(requirementsInfoDO.getSalaryAmount());
+
+                BigDecimal residueAmount = new BigDecimal(0);
+                if (returnToWechat.compareTo(requirementsInfoDO.getSalaryAmount()) == 1) {
+                    //退回佣金
+                    residueAmount = returnToWechat.subtract(requirementsInfoDO.getSalaryAmount());
+                    publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
+                    publisherWalletFlowVO.setCashAmount(residueAmount);
+                }
+                if (returnToWechat.compareTo(requirementsInfoDO.getSalaryAmount()) == -1) {
+                    residueAmount = requirementsInfoDO.getSalaryAmount().subtract(returnToWechat);
+                    publisherWalletFlowVO.setSalaryAmount(residueOrderAmount);
+                }
 
                 if (residueAmount.compareTo(BigDecimal.ZERO) == 0
                         || residueAmount.compareTo(BigDecimal.ZERO) == -1) {
@@ -1087,8 +1097,7 @@ public class RequirementsServiceImpl implements RequirementsService {
                     //flyerCancel(walletFlowVO, request.getHeader("token"));
                     //退回的佣金大于0
                 } else if (residueAmount.compareTo(BigDecimal.ZERO) == 1) {
-                    publisherWalletFlowVO.setCashAmount(residueAmount);
-                    publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount());
+                    //  publisherWalletFlowVO.setCashAmount(residueAmount);
                     publisherWalletFlowVO.setUserAccountId(userAccountId);
                     publisherWalletFlowVO.setOperateUserAccountId(userAccountId);
                     publisherWalletFlowVO.setModeOfPayment(300);