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] =?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