From 0029396fea25ea04485263c54d34984bc695998a Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Fri, 2 Aug 2024 12:29:03 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E5=AF=BC=E5=87=BA=E8=B6=85=E6=97=B6?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-dev.yml    |  2 +-
 .../resources/mapper/business/BusStoreInfoMapper.xml  | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index e1defc8..6ad0d03 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@ ruoyi:
     # 版权年份
     copyrightYear: 2024
     # 文件路径 示例（ Windows配置 F:/home/youshi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: F:/home/youshi/uploadPath
+    profile: E:/home/youshi/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
index 15ed275..7a6fed9 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
@@ -134,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ifnull(sdd.ct,0) todayReturnVisitNum,
         sd.score,
         s.bind_time bindTime,
-        CONCAT(sc.min_order_num,'~',sc.max_order_num) returnVisitUserRange
+        CONCAT(sc.min_order_num,'~',sc.max_order_num) returnVisitUserRange,
+        s.self_delivery_status selfDeliveryStatus
         FROM
         bus_store_info s
         LEFT JOIN bus_store_day_info sd ON s.id = sd.store_id
@@ -146,7 +147,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             group by rv.store_code
         ) sdd ON sdd.store_code = s.store_code
         where  s.self_delivery_status != '3'
-        <if test="bindUser != null  and bindUser != ''"> and bind_user = #{bindUser}</if>
+        <if test="selfDeliveryStatus != null  and selfDeliveryStatus != ''"> and s.self_delivery_status = #{selfDeliveryStatus}</if>
+        <if test="saleBindId != null "> and s.sale_bind_id = #{saleBindId}</if>
+        <if test="bindUser != null  and bindUser != ''"> and s.bind_user = #{bindUser}</if>
         <if test="platformType != null  and platformType != ''"> and s.platform_type = #{platformType}</if>
         <if test="storeCode != null  and storeCode != ''"> and s.store_code = #{storeCode}</if>
         <if test="storeName != null  and storeName != ''"> and s.store_name like concat('%', #{storeName}, '%')</if>
@@ -202,7 +205,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by rv.store_code
         ) sdd ON sdd.store_code = s.store_code
         where  s.self_delivery_status != '3'
-        <if test="bindUser != null  and bindUser != ''"> and bind_user = #{bindUser}</if>
+        <if test="selfDeliveryStatus != null  and selfDeliveryStatus != ''"> and s.self_delivery_status = #{selfDeliveryStatus}</if>
+        <if test="saleBindId != null "> and s.sale_bind_id = #{saleBindId}</if>
+        <if test="bindUser != null  and bindUser != ''"> and s.bind_user = #{bindUser}</if>
         <if test="platformType != null  and platformType != ''"> and s.platform_type = #{platformType}</if>
         <if test="storeCode != null  and storeCode != ''"> and s.store_code = #{storeCode}</if>
         <if test="storeName != null  and storeName != ''"> and s.store_name like concat('%', #{storeName}, '%')</if>