From 28c036ae10ed2ea1a3451fc48d65c7e47797c145 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Fri, 2 Aug 2024 09:09:56 +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

---
 .../com/ruoyi/business/service/impl/MeituanServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/business/BusStoreInfoMapper.xml   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
index 83dc170..ee5fa7e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
@@ -388,7 +388,7 @@ public class MeituanServiceImpl implements IMeituanService {
             if ("0".equals(code)) {
                 JSONArray array = jsonObject.getJSONObject("data").getJSONArray("wmOrderList");
 
-                String key = wmPoiId + date;
+                String key = wmPoiId +"-"+ date;
                 while (array != null && array.size() > 0) {
                     List<BusOrderInfo> list = new ArrayList<>();
                     for (int i = 0; i < array.size(); i++) {
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
index 0ac7677..15ed275 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
@@ -146,6 +146,7 @@ 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="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>
@@ -201,6 +202,7 @@ 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="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>