From d0ecfd5db47e4716757b0336f386eccc83cb2f8e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 19 Mar 2025 10:48:07 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/service/EmisBaseService.java  | 11 +++++------
 .../resources/mapper/EmisCreditSalesmenMapper.xml     |  3 +--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 6134fcec1..1fb740be4 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -263,7 +263,7 @@ public class EmisBaseService {
                         }
                     }
                     else if("1".equals(newSettleType)){
-                        EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType());
+                        EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
                         if(creditSalesmen!=null) {
                             BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
                             if (changeMoney.compareTo(preBalance) > 0) {
@@ -288,7 +288,7 @@ public class EmisBaseService {
                     }
                 }
                 else if("1".equals(newSettleType)){
-                    EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType());
+                    EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
                     if(creditSalesmen!=null) {
                         BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
                         if (changeMoney.compareTo(preBalance) > 0) {
@@ -318,7 +318,7 @@ public class EmisBaseService {
                          }
                      }
                      else if("1".equals(newSettleType)){
-                         EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getCarryType());
+                         EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getCarryType());
                          if(creditSalesmen!=null) {
                              BigDecimal preBalance = creditSalesmen.getCreditMoney().subtract(creditSalesmen.getUseMoney());
                              if (changeMoney.compareTo(preBalance) > 0) {
@@ -359,7 +359,7 @@ public class EmisBaseService {
                  }
              } else if ("1".equals(oldPaymentType) || "3".equals(oldPaymentType)) {
                  // 现金额度占用
-                 EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(oldBill.getSalesmen(),oldBill.getSendDate(),oldBill.getTransType());
+                 EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(oldBill.getPayee(),oldBill.getSendDate(),oldBill.getTransType());
 
                  if (creditSalesmen!=null) {
                      EmisCreditSalesmen item0 = creditSalesmen;
@@ -392,7 +392,7 @@ public class EmisBaseService {
                  }
              } else if ("1".equals(newPaymentType) || "3".equals(newPaymentType)) {
                  // 现金额度占用
-                 EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getSalesmen(),newBill.getSendDate(),newBill.getTransType());
+                 EmisCreditSalesmen creditSalesmen = getEmisCreditSalesmenByCond(newBill.getPayee(),newBill.getSendDate(),newBill.getTransType());
                  if (creditSalesmen!=null) {
                      EmisCreditSalesmen item0 = creditSalesmen;
                      // 获取已使用金额
@@ -1349,7 +1349,6 @@ public class EmisBaseService {
              emisSiteSettleRecord.setPreConfirmBalance(confirmMoney);
 
              // 总账户变动
-
              // 增加
              if("1".equals(emisSiteSettleRecord.getChangeType())){
                  curMoney=curMoney.add(emisSiteSettleRecord.getCurMoney());
diff --git a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
index be804afe4..b8a542438 100644
--- a/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCreditSalesmenMapper.xml
@@ -45,7 +45,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
 
-
             <if test="params.beginCurMoney != null and params.beginCurMoney != ''">
                 and (a.credit_money-a.use_money) <![CDATA[ >= ]]>  #{params.beginCurMoney}
             </if>
@@ -109,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             )
             and a.payment_type in('1','3')
             and a.trans_line_type=c.line_code
-            and a.salesmen=#{salesmen}
+            and a.payee=#{salesmen}
             and FIND_IN_SET(c.trans_type,#{transType})
             and a.send_date <![CDATA[ > ]]> #{startDate} and a.send_date <![CDATA[ <= ]]> #{endDate}
     </select>