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 ce43d51..6c27a9b 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 @@ -6,6 +6,7 @@ import com.pusong.business.domain.PsContractPay; import com.pusong.business.domain.PsTaskMain; import com.pusong.business.domain.vo.PsCompanyInfoVo; import com.pusong.business.domain.vo.PsContractInfoVo; +import com.pusong.business.domain.vo.PsContractPayVo; import com.pusong.business.enums.*; import com.pusong.business.service.IPsContractInfoService; import com.pusong.business.service.IPsContractPayService; @@ -115,11 +116,13 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl update.setPayStatus(PayStatusEnum.FILE.getCode()); payService.updateById(update); + PsContractPayVo psContractPayVo = payService.queryById(Long.valueOf(psApproverRecord.getBusinessId())); + PsContractInfoVo info = psContractInfoService.queryContractByCode(psApproverRecord.getContractCode()); if (ContractStatusEnum.CREATE.getCode().equals(info.getContractStatus())){ noticeService.sendNotice(SysNoticeBo.getFirstPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc())); }else{ - if (info.getResidualMoney().subtract(update.getMoney()).doubleValue() > 0){ + if (info.getResidualMoney().subtract(psContractPayVo.getMoney()).doubleValue() > 0){ noticeService.sendNotice(SysNoticeBo.getPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc())); }else{ noticeService.sendNotice(SysNoticeBo.getLastPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc())); diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java index dc8f86d..120550d 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java @@ -737,7 +737,15 @@ public class HomeServiceImpl implements HomeService { salasVo.setGonghaiNum(psHomeMapper.selectGonghaiNum(queryParam)); salasVo.setCallbackRecordNum(psHomeMapper.selectCallbackRecordNum(queryParam)); salasVo.setNoCallbackRecordNum(psHomeMapper.selectNoCallbackRecordNum(queryParam)); - salasVo.setPayContractAmount(psHomeMapper.selectSumPayContractAmount(queryParam)); + + queryParam.put("businessType", 1); + BigDecimal paySum = psHomeMapper.selectSumPayContractAmount(queryParam); + paySum = paySum == null ? new BigDecimal(0) : paySum; + queryParam.put("businessType", 2); + BigDecimal returnSum = psHomeMapper.selectSumPayContractAmount(queryParam); + returnSum = returnSum == null ? new BigDecimal(0) : returnSum; + salasVo.setPayContractAmount(paySum.subtract(returnSum)); + if (salasVo.getSumContractAmount() == null){ salasVo.setUnPayContractAmount(new BigDecimal(0)); }else { diff --git a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsHomeMapper.xml b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsHomeMapper.xml index c565292..9cdd4d6 100644 --- a/pusong-modules/pusong-business/src/main/resources/mapper/business/PsHomeMapper.xml +++ b/pusong-modules/pusong-business/src/main/resources/mapper/business/PsHomeMapper.xml @@ -52,30 +52,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"