diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java index ad9f3d0..a99ede5 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java @@ -55,9 +55,25 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl update.setId(Long.valueOf(psApproverRecord.getBusinessId())); update.setPayStatus(PayStatusEnum.SUCCESS.getCode()); payService.updateById(update); + if(StringUtils.isNotBlank(info.getSrcContractCode())){ log.info("续费合同不需要生成任务"+info.getSrcContractCode()); + if(StringUtils.equals(ContractStatusEnum.CREATE.getCode(),info.getContractStatus())){ + log.info("修改合同状态"); + PsContractInfo updateInfo = new PsContractInfo(); + updateInfo.setContractCode(info.getContractCode()); + updateInfo.setContractStatus(ContractStatusEnum.EXECUTION.getCode()); + psContractInfoService.updateByCode(updateInfo); + } return; + }else{ + if(StringUtils.equals(ContractStatusEnum.CREATE.getCode(),info.getContractStatus())){ + log.info("修改合同状态"); + PsContractInfo updateInfo = new PsContractInfo(); + updateInfo.setContractCode(info.getContractCode()); + updateInfo.setContractStatus(ContractStatusEnum.RETURN.getCode()); + psContractInfoService.updateByCode(updateInfo); + } } List list = payService.queryListByContractCode(info.getContractCode(), PayBuinessStatusEnum.PAY.getCode(), PayStatusEnum.SUCCESS); @@ -74,13 +90,7 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl psTaskMain.setCustomId(info.getCustomId()); taskMainService.insert(psTaskMain); } - if(StringUtils.equals(ContractStatusEnum.CREATE.getCode(),info.getContractStatus())){ - log.info("修改合同状态"); - PsContractInfo updateInfo = new PsContractInfo(); - updateInfo.setContractCode(info.getContractCode()); - updateInfo.setContractStatus(ContractStatusEnum.RETURN.getCode()); - psContractInfoService.updateByCode(updateInfo); - } + }