RequirementsServiceImpl(update)

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

@@ -997,6 +997,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             BigDecimal refundWeChat = new BigDecimal(0);
             //飞手获得的金额
             BigDecimal receiveSalaryAmount = orderAmount.multiply(new BigDecimal(0.2)).setScale(2, BigDecimal.ROUND_HALF_UP);
+            BigDecimal freeze = orderAmount.multiply(new BigDecimal(0.3)).setScale(2, BigDecimal.ROUND_HALF_UP);
             //微信支付金额大于需要退款金额
             if (weChat.compareTo(residueOrderAmount) == 1) {
                 //用户退百分之七十的费用
@@ -1057,13 +1058,13 @@ public class RequirementsServiceImpl implements RequirementsService {
 
             if (serviceDO.getCashAmount().compareTo(BigDecimal.ZERO) != 0 ||
                     serviceDO.getSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
-                System.out.println(receiveSalaryAmount);
+                System.out.println(freeze);
                 //优先扣除微信
                 BigDecimal weChat1 = requirementsInfoDO.getWeChat();
                 //如果微信扣除的金额小于飞手获得的钱
-                if (weChat1.compareTo(receiveSalaryAmount) == -1) {
+                if (weChat1.compareTo(freeze) == -1) {
                     //还需要扣除多少
-                    BigDecimal subtract = receiveSalaryAmount.subtract(weChat1);
+                    BigDecimal subtract = freeze.subtract(weChat1);
                     if (subtract.compareTo(requirementsInfoDO.getSalaryAmount()) == 1) {
                         publisherWalletFlowVO.setSalaryCashPledge(requirementsInfoDO.getSalaryAmount().negate());
                         //
@@ -1423,7 +1424,7 @@ public class RequirementsServiceImpl implements RequirementsService {
         WalletFlowVO wo = new WalletFlowVO();
         PublisherWalletFlowVO pwf = new PublisherWalletFlowVO();
         IsNullConvertZeroUtil.checkIsNull(pwf);
-        
+
         String paymentType = requirementsEditVO.getPaymentType();
         String[] split = paymentType.split(",");
         Set<String> collect = Arrays.asList(split).stream().collect(Collectors.toSet());