From 2a962d60d7d12da575bd407d75e404cea060b500 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Fri, 9 Jan 2026 13:25:52 +0800 Subject: [PATCH 1/6] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=20-=20=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E7=BB=9F=E8=AE=A1=20-=20=E9=80=BE=E6=9C=9F?= =?UTF-8?q?=E5=B7=B2=E6=94=B6=E9=87=91=E9=A2=9D(60=E5=A4=A9)=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=9F=A5=E7=9C=8B=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E7=8E=B0=E9=87=91=E8=B4=A6=E5=8D=95=E6=A0=B8=E9=94=80/?= =?UTF-8?q?=E6=9C=88=E7=BB=93=E8=B4=A6=E5=8D=95=E6=A0=B8=E9=94=80=20-=20?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=97=B6=E6=9B=B4=E6=96=B0=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=97=B6=E5=8F=AA=E6=9B=B4=E6=96=B0=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E5=AF=B9=E5=BA=94=E5=8F=91=E7=A5=A8=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisSettleBillServiceImpl.java | 37 +++++++++++-------- .../mapper/EmisSettlePayRecordMapper.xml | 5 +++ 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index 96219b6c3..b9d4e09bf 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -1175,27 +1175,32 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS // 遍历每个发票记录，更新其收款状态 for (EmisSettleInvoiceRecord invoiceRecord : invoiceRecordList) { - String invoiceSettleBillNo = invoiceRecord.getSettleBillNo(); - if (StringUtils.isEmpty(invoiceSettleBillNo)) { + String applySeqNo = invoiceRecord.getApplySeqNo(); + if (StringUtils.isEmpty(applySeqNo)) { + continue; + } + + // 通过申请序号获取发票关联的子账单列表 + List invoiceRelList = emisSettleInvoiceRelMapper.selectListByApplySeqNo(applySeqNo); + if (CollectionUtils.isEmpty(invoiceRelList)) { + log.debug("updateInvoicePaymentStatus===>发票申请序号{}没有关联的子账单", applySeqNo); continue; } - // 解析发票对应的所有账单号（可能用逗号分隔） - String[] billNoArray = invoiceSettleBillNo.split(","); BigDecimal totalRecedMoney = BigDecimal.ZERO; - // 遍历发票对应的每个账单号，计算每个账单的实际收款金额并累加 - for (String billNo : billNoArray) { - billNo = billNo.trim(); - if (StringUtils.isEmpty(billNo)) { + // 遍历发票关联的每个子账单，获取运单已收金额并累加 + for (EmisSettleInvoiceRel invoiceRel : invoiceRelList) { + String subBillNo = invoiceRel.getBillNo(); + if (StringUtils.isEmpty(subBillNo)) { continue; } - // 通过账单号查询emis_settle_bill获取reced_money作为已收金额 - EmisSettleBill bill = selectEmisSettleBillBySettleBillNo(billNo); - BigDecimal billTotalHasPayMoney = (bill != null && bill.getRecedMoney() != null) - ? bill.getRecedMoney() - : BigDecimal.ZERO; - totalRecedMoney = totalRecedMoney.add(billTotalHasPayMoney); + + // 通过子账单号查询子账单，获取运单已收金额 + EmisSettleSubBill subBill = emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(subBillNo); + if (subBill != null && subBill.getRecedMoney() != null) { + totalRecedMoney = totalRecedMoney.add(subBill.getRecedMoney()); + } } // 获取发票申请金额 @@ -1219,8 +1224,8 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS updateInvoiceRecord.setRecedMoney(totalRecedMoney); emisSettleInvoiceRecordMapper.updateEmisSettleInvoiceRecord(updateInvoiceRecord); - log.debug("updateInvoicePaymentStatus===>发票申请序号:{}, 收款状态:{}, 已收金额:{}, 申请金额:{}, 对应账单号:{}", - invoiceRecord.getApplySeqNo(), paymentStatus, totalRecedMoney, applyMoney, invoiceSettleBillNo); + log.debug("updateInvoicePaymentStatus===>发票申请序号:{}, 收款状态:{}, 已收金额:{}, 申请金额:{}", + invoiceRecord.getApplySeqNo(), paymentStatus, totalRecedMoney, applyMoney); } } catch (Exception e) { diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml index daccddf6e..88c18f49a 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml @@ -575,6 +575,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.trade_date ]]> esb.payment_due_date and b.trade_date = ]]> DATE_SUB( esb.payment_due_date, INTERVAL (esb.credit_period-60) DAY ) ) + OR + ( + ( (esb.settle_type='2' and esb.credit_period 30) or esb.settle_type='1' ) + and b.trade_date ]]> esb.payment_due_date + ) ) From c2a9a8fd22ff04f33741277ab8d648401d40d532 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 12 Jan 2026 09:19:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=94=80=E8=B4=A6=E7=94=B3=E8=AF=B7=E3=80=81?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83=E9=94=80=E8=B4=A6=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xdadan/erp/web/emis/EmisWriteoffApplyController.java | 2 ++ .../src/main/resources/mapper/EmisWriteoffApplyMapper.xml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java index c9818574a..9919088de 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWriteoffApplyController.java @@ -57,6 +57,8 @@ public class EmisWriteoffApplyController extends EmisBaseController { emisWriteoffApply = new EmisWriteoffApply(); } + setPrivParams(emisWriteoffApply); + // 处理params参数，支持运单号、账单号多选查询 if (emisWriteoffApply.getParams() != null && emisWriteoffApply.getParams().containsKey("queryParams")) { String queryParams = (String) emisWriteoffApply.getParams().get("queryParams"); diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml index 5728e4b58..4a599f1ce 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml @@ -104,6 +104,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + and ( + apply_site_code=#{params.privSiteCode} + ) + order by wa.create_time desc From 91adaeefba020358d229d5c68784111d4ead48d5 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 12 Jan 2026 10:07:00 +0800 Subject: [PATCH 3/6] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=94=80=E8=B4=A6=E7=94=B3=E8=AF=B7=E3=80=81?= =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E4=B8=AD=E5=BF=83=E9=94=80=E8=B4=A6=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=20=20TMS=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=20-=20=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=20-=20=E7=8E=B0=E9=87=91=E8=B4=A6=E5=8D=95=E6=A0=B8?= =?UTF-8?q?=E9=94=80=E3=80=81=E6=9C=88=E7=BB=93=E8=B4=A6=E5=8D=95=E6=A0=B8?= =?UTF-8?q?=E9=94=80=EF=BC=8C=E5=B7=B2=E7=94=B3=E8=AF=B7=E9=94=80=E8=B4=A6?= =?UTF-8?q?=E7=9A=84=E6=97=A0=E6=B3=95=E6=A0=B8=E9=94=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisSettlePayRecordServiceImpl.java | 67 +++++++++++++++++++ .../mapper/EmisWriteoffApplyMapper.xml | 21 +++++- 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index dd36bf473..a2aed7b39 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service.impl; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; +import com.xdadan.erp.emis.domain.enumtype.WriteoffApplyStatus; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.domain.stat.PayBackRecordDtl; import com.xdadan.erp.emis.mapper.*; @@ -80,6 +81,12 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I @Autowired private EmisWaybillMapper emisWaybillMapper; + @Autowired + private EmisWriteoffApplyMapper emisWriteoffApplyMapper; + + @Autowired + private EmisWriteoffApplyDetailMapper emisWriteoffApplyDetailMapper; + /** * 查询账单收退款记录 * @@ -473,6 +480,9 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I && !"7".equals(emisSettlePayRecord.getPayType())) { throw new EmisBizError(EmisBizErrorType.FAIL, "业务账单未确认，不允许收款！"); } + + // 校验账单对应的运单是否在销账申请表中，且中心审核状态为未审核 + checkWriteoffApplyStatus(settleBillNo); } } @@ -604,6 +614,63 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I } } + /** + * 校验账单对应的运单是否在销账申请表中，且中心审核状态为未审核 + * + * @param settleBillNo 账单号 + * @throws EmisBizError 如果存在未审核的销账申请，则抛出异常 + */ + private void checkWriteoffApplyStatus(String settleBillNo) throws EmisBizError { + // 根据账单号查询子账单列表，获取运单号列表 + List subBillList = emisSettleSubBillMapper.selectSubBillListBySettleBillNo(settleBillNo); + if (CollectionUtils.isEmpty(subBillList)) { + return; + } + + // 提取运单号列表 + List billCodeList = subBillList.stream() + .map(EmisSettleSubBill::getBillCode) + .filter(StringUtils::isNotBlank) + .distinct() + .collect(Collectors.toList()); + + if (CollectionUtils.isEmpty(billCodeList)) { + return; + } + + // 根据运单号查询销账申请明细 + for (String billCode : billCodeList) { + EmisWriteoffApplyDetail queryDetail = new EmisWriteoffApplyDetail(); + queryDetail.setBillCode(billCode); + List detailList = emisWriteoffApplyDetailMapper.selectEmisWriteoffApplyDetailList(queryDetail); + + if (CollectionUtils.isEmpty(detailList)) { + continue; + } + + // 获取所有申请ID，去重 + List applyIds = detailList.stream() + .map(EmisWriteoffApplyDetail::getApplyId) + .filter(id -> id != null) + .distinct() + .collect(Collectors.toList()); + + if (CollectionUtils.isEmpty(applyIds)) { + continue; + } + + // 查询销账申请，检查中心审核状态 + for (Long applyId : applyIds) { + EmisWriteoffApply writeoffApply = emisWriteoffApplyMapper.selectEmisWriteoffApplyById(applyId); + if (writeoffApply != null + && WriteoffApplyStatus.CENTER_PENDING.statusCode.equals(writeoffApply.getBlCenterConfirmed())) { + throw new EmisBizError(EmisBizErrorType.FAIL, + billCode + "已经登记业务销账申请，请先处理再销账"); + } + } + } + } + /** * 收款退款 * diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml index 4a599f1ce..10bf15792 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml @@ -106,7 +106,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ( - apply_site_code=#{params.privSiteCode} + wa.apply_site_code=#{params.privSiteCode} + or EXISTS ( + select 1 from emis_writeoff_apply_detail wad_check + inner join emis_waybill w_check on wad_check.bill_code = w_check.bill_code and w_check.del_flag = '0' + where wad_check.apply_id = wa.id + and wad_check.del_flag = '0' + and ( + w_check.salesmen = #{params.privEmpName} + or w_check.payee = #{params.privEmpName} + or EXISTS ( + select 1 from emis_salesmen_rel esr + where esr.del_flag = '0' + and esr.bl_open = '1' + and now() = ]]> esr.start_date + and now() esr.end_date + and esr.salesmen = w_check.salesmen + and esr.sales_ass = #{params.privEmpName} + ) + ) + ) ) From e67e7a1d88a661e3ffafe2dee93861e3e031f666 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 12 Jan 2026 14:09:17 +0800 Subject: [PATCH 4/6] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=94=80=E8=B4=A6=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E7=90=86=E8=B5=94=E9=87=91=E9=A2=9D=E3=80=81=E6=8A=98=E8=AE=A9?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E3=80=81=E6=8A=B5=E6=89=A3=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=81=E5=85=B6=E4=BB=96=E9=87=91=E9=A2=9D=E4=B8=8D=E4=B8=BA?= =?UTF-8?q?0=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EmisWriteoffApplyServiceImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java index 03fbcfb44..247913109 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java @@ -153,6 +153,22 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm throw new EmisBizError("运单号 " + detail.getBillCode() + " 的账单应收金额为空"); } + // 检查结算账单的理赔金额、折让金额、抵扣金额、其他金额 + if (detail.getEmisSettleBill() == null) { + throw new EmisBizError("运单号 " + detail.getBillCode() + " 的账单信息为空"); + } + BigDecimal satisfyMoney = detail.getEmisSettleBill().getSatisfyMoney(); + BigDecimal allowanceMoney = detail.getEmisSettleBill().getAllowanceMoney(); + BigDecimal deductionMoney = detail.getEmisSettleBill().getDeductionMoney(); + BigDecimal otherMoney = detail.getEmisSettleBill().getOtherMoney(); + + if ((satisfyMoney != null && satisfyMoney.compareTo(BigDecimal.ZERO) != 0) || + (allowanceMoney != null && allowanceMoney.compareTo(BigDecimal.ZERO) != 0) || + (deductionMoney != null && deductionMoney.compareTo(BigDecimal.ZERO) != 0) || + (otherMoney != null && otherMoney.compareTo(BigDecimal.ZERO) != 0)) { + throw new EmisBizError(detail.getSettleBillNo() + " 存在理赔金额/折让金额/抵扣金额/其他金额,请联系财务处理"); + } + // 验证：申请金额 + 已收金额 <= 账单应收金额 BigDecimal totalAmount = detail.getApplyMoney().add(receivedAmount); if (totalAmount.compareTo(recMoney) > 0) { From dc941ef22d1349b29ee9548ba4755837297f7a02 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 12 Jan 2026 14:14:25 +0800 Subject: [PATCH 5/6] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E9=94=80=E8=B4=A6=E7=94=B3=E8=AF=B7=20-=20?= =?UTF-8?q?=E7=90=86=E8=B5=94=E9=87=91=E9=A2=9D=E3=80=81=E6=8A=98=E8=AE=A9?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E3=80=81=E6=8A=B5=E6=89=A3=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E3=80=81=E5=85=B6=E4=BB=96=E9=87=91=E9=A2=9D=E4=B8=8D=E4=B8=BA?= =?UTF-8?q?0=E7=9A=84=E4=B8=8D=E5=85=81=E8=AE=B8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java index 247913109..98d8a4ce3 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWriteoffApplyServiceImpl.java @@ -166,7 +166,7 @@ public class EmisWriteoffApplyServiceImpl extends EmisBaseService implements IEm (allowanceMoney != null && allowanceMoney.compareTo(BigDecimal.ZERO) != 0) || (deductionMoney != null && deductionMoney.compareTo(BigDecimal.ZERO) != 0) || (otherMoney != null && otherMoney.compareTo(BigDecimal.ZERO) != 0)) { - throw new EmisBizError(detail.getSettleBillNo() + " 存在理赔金额/折让金额/抵扣金额/其他金额,请联系财务处理"); + throw new EmisBizError(detail.getBillCode() + " 存在理赔金额/折让金额/抵扣金额/其他金额,请联系财务处理"); } // 验证：申请金额 + 已收金额 <= 账单应收金额 From 6114b400295f9eabbeff820d52b84ce59af8dc8f Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Mon, 12 Jan 2026 17:17:50 +0800 Subject: [PATCH 6/6] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=20-=20=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E7=BB=9F=E8=AE=A1/=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=9B=9E=E6=AC=BE=E7=8E=87=E7=BB=9F=E8=AE=A1=20-=20=E8=B6=85?= =?UTF-8?q?=E6=9C=9F=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D(70%)=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=9F=A5=E7=9C=8B=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?= =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/EmisSettleBillMapper.xml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml index f3a7f8cfd..abd20d6a6 100644 --- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml @@ -353,8 +353,6 @@ when a.settle_type = '2' and a.credit_period = 30 and a.settle_day = '1' - and b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) - and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) and NOT EXISTS ( SELECT 1 FROM emis_settle_invoice_record f @@ -371,7 +369,12 @@ end ) ) + then case + when b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) + and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) then ifnull(d.pay_money,0) + else 0 + end when a.settle_type='2' and a.credit_period = ]]> 30 and b.trade_date ]]> a.payment_due_date @@ -1053,8 +1056,6 @@ when a.settle_type = '2' and a.credit_period = 30 and a.settle_day = '1' - and b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) - and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) and NOT EXISTS ( SELECT 1 FROM emis_settle_invoice_record f @@ -1071,7 +1072,12 @@ end ) ) + then case + when b.trade_date = ]]> DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 2 MONTH) + and b.trade_date DATE_ADD(STR_TO_DATE(CONCAT(REPLACE(a.bill_month,'-',''),'01'),'%Y%m%d'), INTERVAL 3 MONTH) then ifnull(d.pay_money,0) + else 0 + end when a.settle_type='2' and a.credit_period = ]]> 30 and b.trade_date ]]> a.payment_due_date