mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
mx 2024-11-14 10:05:26 +08:00
parent 066ad475cd
commit 77bc7793e9
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/approver/impl/PayContractApproverServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.pusong.business.domain.PsContractPay;
import com.pusong.business.domain.PsTaskMain; import com.pusong.business.domain.PsTaskMain;
import com.pusong.business.domain.vo.PsCompanyInfoVo; import com.pusong.business.domain.vo.PsCompanyInfoVo;
import com.pusong.business.domain.vo.PsContractInfoVo; import com.pusong.business.domain.vo.PsContractInfoVo;
import com.pusong.business.domain.vo.PsContractPayVo;
import com.pusong.business.enums.*; import com.pusong.business.enums.*;
import com.pusong.business.service.IPsContractInfoService; import com.pusong.business.service.IPsContractInfoService;
import com.pusong.business.service.IPsContractPayService; import com.pusong.business.service.IPsContractPayService;
@ -115,11 +116,13 @@ public class PayContractApproverServiceImpl extends ApproverAbstractServiceImpl
update.setPayStatus(PayStatusEnum.FILE.getCode()); update.setPayStatus(PayStatusEnum.FILE.getCode());
payService.updateById(update); payService.updateById(update);
PsContractPayVo psContractPayVo = payService.queryById(Long.valueOf(psApproverRecord.getBusinessId()));
PsContractInfoVo info = psContractInfoService.queryContractByCode(psApproverRecord.getContractCode()); PsContractInfoVo info = psContractInfoService.queryContractByCode(psApproverRecord.getContractCode());
if (ContractStatusEnum.CREATE.getCode().equals(info.getContractStatus())){ if (ContractStatusEnum.CREATE.getCode().equals(info.getContractStatus())){
noticeService.sendNotice(SysNoticeBo.getFirstPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc())); noticeService.sendNotice(SysNoticeBo.getFirstPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc()));
}else{ }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())); noticeService.sendNotice(SysNoticeBo.getPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc()));
}else{ }else{
noticeService.sendNotice(SysNoticeBo.getLastPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc())); noticeService.sendNotice(SysNoticeBo.getLastPayErrorInstance(info.getCustomManager(), info.getPsCustomInfoVo().getCustomName(), psApproverRecord.getApproverDesc()));

10
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/HomeServiceImpl.java
View File

@ -737,7 +737,15 @@ public class HomeServiceImpl implements HomeService {
salasVo.setGonghaiNum(psHomeMapper.selectGonghaiNum(queryParam)); salasVo.setGonghaiNum(psHomeMapper.selectGonghaiNum(queryParam));
salasVo.setCallbackRecordNum(psHomeMapper.selectCallbackRecordNum(queryParam)); salasVo.setCallbackRecordNum(psHomeMapper.selectCallbackRecordNum(queryParam));
salasVo.setNoCallbackRecordNum(psHomeMapper.selectNoCallbackRecordNum(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){ if (salasVo.getSumContractAmount() == null){
salasVo.setUnPayContractAmount(new BigDecimal(0)); salasVo.setUnPayContractAmount(new BigDecimal(0));
}else { }else {

32
pusong-modules/pusong-business/src/main/resources/mapper/business/PsHomeMapper.xml
View File

@ -52,30 +52,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSumPayContractAmount"> <select id="selectSumPayContractAmount">
select select sum(money) from ps_contract_info info
(select sum(money) from ps_contract_info info inner join ps_contract_pay pay on pay.contract_code = info.contract_code and pay.business_type = #{queryParam.businessType} and pay.del_flag = 0
inner join ps_contract_pay pay on pay.contract_code = info.contract_code and pay.business_type = 1 and pay.del_flag = 0
where where
info.contract_status != 10 and info.del_flag = 0 info.contract_status != 10 and info.del_flag = 0
<if test="queryParam.startDate != null"> <if test="queryParam.startDate != null">
and info.create_time >= #{queryParam.startDate} and info.create_time >= #{queryParam.startDate}
</if> </if>
<if test="queryParam.endDate != null"> <if test="queryParam.endDate != null">
and info.create_time &lt; #{queryParam.endDate} and info.create_time &lt; #{queryParam.endDate}
</if> </if>
)
-
(select sum(money) from ps_contract_info info
inner join ps_contract_pay pay on pay.contract_code = info.contract_code and pay.business_type = 2 and pay.del_flag = 0
where
info.contract_status != 10 and info.del_flag = 0
<if test="queryParam.startDate != null">
and info.create_time >= #{queryParam.startDate}
</if>
<if test="queryParam.endDate != null">
and info.create_time &lt; #{queryParam.endDate}
</if>
)
</select> </select>