Requiremen(update)

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

@@ -1515,7 +1515,7 @@ public class RequirementsServiceImpl implements RequirementsService {
             //倒计时
           redisUtil.ins("order_" + requirementsInfoDO.getPublisherNumber(), String.valueOf(requirementsInfoDO), 1, TimeUnit.HOURS);
 
-           // redisUtil.ins("order_" + requirementsInfoDO.getPublisherNumber(), String.valueOf(requirementsInfoDO), 2, TimeUnit.SECONDS);
+          // redisUtil.ins("order_" + requirementsInfoDO.getPublisherNumber(), String.valueOf(requirementsInfoDO), 3, TimeUnit.SECONDS);
 
             return ResultBody.success();
         } else {
@@ -1562,8 +1562,16 @@ public class RequirementsServiceImpl implements RequirementsService {
             publisherWalletFlowVO.setModeOfPayment(1000);
             if (updateAmount.getCashAmount().compareTo(BigDecimal.ZERO)!=0||
             updateAmount.getSalaryAmount().compareTo(BigDecimal.ZERO)!=0){
-               publisherWalletFlowVO.setRefundSalaryAmount(updateAmount.getSalaryAmount().negate());
-               publisherWalletFlowVO.setRefundCashAmount(updateAmount.getCashAmount().negate());
+
+                BigDecimal cash = publisherWalletFlowVO.getCashAmount().negate();
+                BigDecimal salary = publisherWalletFlowVO.getSalaryAmount().negate();
+                BigDecimal add = cash.add(updateAmount.getCashAmount());
+                BigDecimal addSalary = salary.add(updateAmount.getSalaryAmount());
+                publisherWalletFlowVO.setCashAmount(add.negate());
+                publisherWalletFlowVO.setSalaryAmount(addSalary.negate());
+
+                // publisherWalletFlowVO.setRefundSalaryAmount(updateAmount.getSalaryAmount().negate());
+               //publisherWalletFlowVO.setRefundCashAmount(updateAmount.getCashAmount().negate());
             }if(updateAmount.getReturnCashAmount().compareTo(BigDecimal.ZERO)!=0 ||
             updateAmount.getReturnSalaryAmount().compareTo(BigDecimal.ZERO)!=0){
                 publisherWalletFlowVO.setRefundCashAmount(updateAmount.getReturnCashAmount());