Require(update)

release-service/src/main/java/com/mmc/csf/release/controller/countDown/RedisKeyExpirationListener.java

@@ -92,6 +92,10 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
         //  RequirementsInfoDO infoDO = requirementsDao.selectSettleAccounts(settleAccountsVO);
         RequirementsInfoDO requirementsInfoDO = requirementsDao.publisherCancel(infoDO.getId(), infoDO.getUserAccountId());
         RequirementsServiceDO requirementsServiceDO = requirementsDao.serviceSettleAccounts(settleAccountsVO);
+        if (requirementsInfoDO.getServiceFlowId()==5){
+            return ResultBody.error("已结算");
+        }
+
         RequirementsAmountUpdateDO updateAmount = requirementsDao.findUpdateAmount(infoDO.getId());
         IsNullConvertZeroUtil.checkIsNull(infoDO);
         IsNullConvertZeroUtil.checkIsNull(requirementsServiceDO);

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

@@ -1318,11 +1318,15 @@ public class RequirementsServiceImpl implements RequirementsService {
         //发布者责任
         if (liabilityProblemVO.getDuty().equals(2)){
             publisherCancel(liabilityProblemVO.getRequirementsInfoId(),requirementsInfoDO.getUserAccountId(),request);
+            requirementsDao.updateInfo(liabilityProblemVO.getRequirementsInfoId(), 7);
+            requirementsDao.updateScene(liabilityProblemVO.getRequirementsInfoId(), 7);
             return ResultBody.success();
         }
         //飞手责任
         if (liabilityProblemVO.getDuty().equals(3)){
             droneFlyerCancel(liabilityProblemVO.getRequirementsInfoId(),requirementsServiceDO.getPilotCertificationUserId(),request);
+            requirementsDao.updateInfo(liabilityProblemVO.getRequirementsInfoId(), 7);
+            requirementsDao.updateScene(liabilityProblemVO.getRequirementsInfoId(), 7);
             return ResultBody.success();
         }
         return ResultBody.success();
@@ -1997,6 +2001,10 @@ public class RequirementsServiceImpl implements RequirementsService {
         IsNullConvertZeroUtil.checkIsNull(serviceDO);
         IsNullConvertZeroUtil.checkIsNull(requirementsInfoDO);
 
+        if (requirementsInfoDO.getServiceFlowId()==5){
+            return ResultBody.error("已结算");
+        }
+
         if (requirementsInfoDO == null) {
             return ResultBody.error("结算失败");
         }
@@ -2005,8 +2013,31 @@ public class RequirementsServiceImpl implements RequirementsService {
         if (updateAmount!=null){
             //继续支付需要扣除金额
             IsNullConvertZeroUtil.checkIsNull(updateAmount);
-            publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount().negate());
-            publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount().negate());
+
+            if (updateAmount.getUpdateOrderAmount().compareTo(updateAmount.getOrderAmount())==-1){
+
+                if (updateAmount.getReturnSalaryAmount().compareTo(BigDecimal.ZERO)!=0){
+                    BigDecimal orderAmount = updateAmount.getOrderAmount();
+                    BigDecimal returnSalaryAmount = updateAmount.getReturnSalaryAmount();
+                    BigDecimal subtract = orderAmount.subtract(returnSalaryAmount);
+                    publisherWalletFlowVO.setSalaryAmount(subtract.negate());
+                }else{
+                    publisherWalletFlowVO.setSalaryAmount(BigDecimal.ZERO);
+                }
+                if (updateAmount.getReturnCashAmount().compareTo(BigDecimal.ZERO)!=0){
+                    BigDecimal orderAmount = updateAmount.getOrderAmount();
+                    BigDecimal returnCashAmount = updateAmount.getReturnCashAmount();
+                    BigDecimal subtract = orderAmount.subtract(returnCashAmount);
+                    publisherWalletFlowVO.setCashAmount(subtract.negate());
+                }else{
+                    publisherWalletFlowVO.setCashAmount(BigDecimal.ZERO);
+                }
+            }
+            if (updateAmount.getUpdateOrderAmount().compareTo(updateAmount.getOrderAmount())==1){
+                publisherWalletFlowVO.setSalaryAmount(requirementsInfoDO.getSalaryAmount().negate());
+                publisherWalletFlowVO.setCashAmount(requirementsInfoDO.getCashAmount().negate());
+            }
+
             publisherWalletFlowVO.setUserAccountId(requirementsInfoDO.getUserAccountId());
             publisherWalletFlowVO.setOperateUserAccountId(agreeVO.getUserAccountId());
             publisherWalletFlowVO.setModeOfPayment(1000);