From 0421d7dd44dae68a5648e5ef5049d58ae74c4ae6 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 6 Nov 2025 10:35:21 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E7=AE=A1=E7=90=86=20-=20=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E6=8F=90=E6=88=90=E6=98=8E=E7=BB=86=20-=20=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=AE=A1=E6=8F=90=E6=AF=94=E4=BE=8B=E9=85=8D=E7=BD=AE=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E6=8F=90=E6=88=90=E6=98=8E=E7=BB=86=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=AF=84=E4=BB=B6=E6=97=A5=E6=9C=9F=E5=9C=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9C=89=E6=95=88=E6=9C=9F=E5=86=85=EF=BC=8C?=
 =?UTF-8?q?=E6=89=8D=E6=8C=89=E6=AF=94=E4=BE=8B=E5=88=86=E9=85=8D=E6=8F=90?=
 =?UTF-8?q?=E6=88=90=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/service/impl/EmisCommissionProfitServiceImpl.java    | 4 ++++
 .../main/resources/mapper/EmisSalesCommissionRatioMapper.xml  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
index 9604e7183..59902fe7a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
@@ -1355,6 +1355,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                                 ratioQuery.setSalesSupport(salesSupport);
                                 ratioQuery.setSalesExecutive(salesExecutive);
                                 ratioQuery.setStatus("1");
+                                // 添加运单寄件日期条件，查询运单寄件日期在计提表有效期内的比例配置
+                                if (waybill.getSendDate() != null) {
+                                    ratioQuery.getParams().put("sendDate", waybill.getSendDate());
+                                }
                                 List<EmisSalesCommissionRatio> ratioList = emisSalesCommissionRatioMapper
                                         .selectEmisSalesCommissionRatioList(ratioQuery);
                                 if (!CollectionUtils.isEmpty(ratioList)) {
diff --git a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml
index 450785fa7..748dce7b9 100644
--- a/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml
@@ -38,6 +38,10 @@
             <if test="params.endDateAfterNow != null and params.endDateAfterNow == true">
                 and end_date &gt;= NOW()
             </if>
+            <!-- 查询运单寄件日期在计提表有效期内的记录 -->
+            <if test="params.sendDate != null">
+                and start_date &lt;= #{params.sendDate} and end_date &gt;= #{params.sendDate}
+            </if>
         </where>
         ORDER BY id DESC
     </select>