aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-05-05 09:22:24 +08:00
parent 3332f18423
commit 952b06caf0
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java
View File

@ -17,9 +17,7 @@ import java.util.Map;
import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.*;
import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.mapper.EmisSettleBillMapper; import com.xdadan.erp.emis.mapper.*;
import com.xdadan.erp.emis.mapper.EmisSettlePayRelMapper;
import com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper;
import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.service.EmisBaseService;
import com.xdadan.erp.emis.service.IEmisSettleBillService; import com.xdadan.erp.emis.service.IEmisSettleBillService;
import com.xdadan.erp.emis.service.IEmisSettleSubBillService; import com.xdadan.erp.emis.service.IEmisSettleSubBillService;
@ -30,7 +28,6 @@ import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.xdadan.erp.emis.mapper.EmisSettlePayRecordMapper;
import com.xdadan.erp.emis.service.IEmisSettlePayRecordService; import com.xdadan.erp.emis.service.IEmisSettlePayRecordService;
/** /**
@ -49,6 +46,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
@Autowired @Autowired
private EmisSettlePayRelMapper emisSettlePayRelMapper; private EmisSettlePayRelMapper emisSettlePayRelMapper;
@Autowired
private EmisSettlePayBillRelMapper emisSettlePayBillRelMapper;
@Autowired @Autowired
private EmisSettleBillMapper emisSettleBillMapper; private EmisSettleBillMapper emisSettleBillMapper;
@ -141,6 +141,12 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I
} }
// 插入账单和支付单关联关系
EmisSettlePayBillRel emisSettlePayBillRel=new EmisSettlePayBillRel();
emisSettlePayBillRel.setPayId(payId);
emisSettlePayBillRel.setSettleBillNo(emisSettlePayRecord.getSettleBillNo());
emisSettlePayBillRelMapper.insertEmisSettlePayBillRel(emisSettlePayBillRel);
// 记录收退款运单号 // 记录收退款运单号
List<EmisSettlePayRel> listRel=emisSettlePayRecord.getPayRelList(); List<EmisSettlePayRel> listRel=emisSettlePayRecord.getPayRelList();
if(!CollectionUtils.isEmpty(listRel)){ if(!CollectionUtils.isEmpty(listRel)){

7
emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
View File

@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from emis_settle_pay_rel a from emis_settle_pay_rel a
where del_flag='0' where del_flag='0'
AND pay_id IN ( AND pay_id IN (
<!--
SELECT x1.pay_id FROM SELECT x1.pay_id FROM
emis_settle_pay_record x1, emis_settle_pay_record x1,
emis_settle_bill x2 emis_settle_bill x2
@ -55,6 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND x2.del_flag = '0' AND x2.del_flag = '0'
AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no ) AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo}) AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
-->
select pay_id from emis_settle_pay_bill_rel espbr where espbr.del_flag='0' and FIND_IN_SET(espbr.settle_bill_no, #{settleBillNo})
) )
AND a.bill_no IN ( AND a.bill_no IN (
select essb.bill_no from emis_settle_sub_bill essb where essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo}) select essb.bill_no from emis_settle_sub_bill essb where essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})
@ -67,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from emis_settle_pay_rel a from emis_settle_pay_rel a
where del_flag='0' where del_flag='0'
AND pay_id IN ( AND pay_id IN (
<!--
SELECT x1.pay_id FROM SELECT x1.pay_id FROM
emis_settle_pay_record x1, emis_settle_pay_record x1,
emis_settle_bill x2 emis_settle_bill x2
@ -75,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND x2.del_flag = '0' AND x2.del_flag = '0'
AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no ) AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo}) AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
-->
select pay_id from emis_settle_pay_bill_rel espbr where espbr.del_flag='0' and FIND_IN_SET(espbr.settle_bill_no, #{settleBillNo})
) )
AND a.bill_no IN ( AND a.bill_no IN (
select essb.bill_no from emis_settle_sub_bill essb where essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo}) select essb.bill_no from emis_settle_sub_bill essb where essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})