From 35f6ec9f74453473729b6ced4ac382f1b33c8937 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 21 Aug 2025 15:37:23 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E7=8E=B0=E9=87=91=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E9=A2=9D=E5=BA=A6=E5=89=A9=E4=BD=99=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E3=80=81=E5=89=A9=E4=BD=99=E6=AF=94=E4=BE=8B=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE=E7=90=86=E8=B5=94=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E8=AE=A1=E7=AE=97=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../main/resources/mapper/EmisCreditSalesmenMapper.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
index 16a0b44a3..880658105 100644
--- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and NOW() between t.start_date and t.end_date
                     order by t.create_time desc
                     limit 1), 0
-                ) - a.use_money) <![CDATA[ >= ]]>  #{params.beginCurMoney}
+                ) - a.use_money + COALESCE(a.satisfy_money, 0)) <![CDATA[ >= ]]>  #{params.beginCurMoney}
             </if>
             <if test="params.endCurMoney != null and params.endCurMoney != ''">
                 and (COALESCE(a.credit_money, 0) + COALESCE(
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and NOW() between t.start_date and t.end_date
                     order by t.create_time desc
                     limit 1), 0
-                ) - a.use_money) <![CDATA[ < ]]>  #{params.endCurMoney}
+                ) - a.use_money + COALESCE(a.satisfy_money, 0)) <![CDATA[ < ]]>  #{params.endCurMoney}
             </if>
 
             <if test="params.beginCurMoneyRate != null and params.beginCurMoneyRate != ''">
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and NOW() between t.start_date and t.end_date
                     order by t.create_time desc
                     limit 1), 0
-                ) - a.use_money)/(COALESCE(a.credit_money, 0) + COALESCE(
+                ) - a.use_money + COALESCE(a.satisfy_money, 0))/(COALESCE(a.credit_money, 0) + COALESCE(
                     (select temp_credit_money_adjust
                     from emis_temp_credit_salesmen t
                     where t.acc_code = a.acc_code
@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and NOW() between t.start_date and t.end_date
                     order by t.create_time desc
                     limit 1), 0
-                ) - a.use_money)/(COALESCE(a.credit_money, 0) + COALESCE(
+                ) - a.use_money + COALESCE(a.satisfy_money, 0))/(COALESCE(a.credit_money, 0) + COALESCE(
                     (select temp_credit_money_adjust
                     from emis_temp_credit_salesmen t
                     where t.acc_code = a.acc_code