From 829beed6e7108c77b3e84e9a86898fa22f22b27c Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sun, 11 Aug 2024 22:00:18 +0800
Subject: [PATCH] =?UTF-8?q?1;=E7=BB=91=E5=AE=9A=E5=BA=97=E9=93=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=202=EF=BC=9B=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/impl/MeituanServiceImpl.java     | 11 +++++++++--
 .../mapper/business/BusStoreConfigInfoMapper.xml      |  9 +++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

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 e3c2a3e..0f40a39 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
@@ -910,7 +910,7 @@ public class MeituanServiceImpl implements IMeituanService {
                     target.setId(null);
                     target.setCreateTime(Date.from(date.atZone(ZoneId.systemDefault()).toInstant()));
                     addList.add(target);
-                }else{
+                }else if(list2.size() == 1){
                     BusStoreDayHistoryInfo target = new BusStoreDayHistoryInfo();
                     BeanUtils.copyProperties(busStoreDayInfo, target);
                     target.setCreateTime(Date.from(date.atZone(ZoneId.systemDefault()).toInstant()));
@@ -1073,8 +1073,15 @@ public class MeituanServiceImpl implements IMeituanService {
 
     // 解析Cookie
     private String valueFromCookie(String key, String text) {
+        if("".equals(text)){
+            return "";
+        }
+        int index = text.indexOf(key);
+        if(index == -1){
+            return "";
+        }
         key = key+"=";
-        String s = text.substring(text.indexOf(key), text.length());
+        String s = text.substring(index, text.length());
         String value = s.substring(s.indexOf("=") + 1, s.indexOf(";"));
         return value;
     }
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml
index 405ecc2..1ab13bf 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreConfigInfoMapper.xml
@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="BusStoreConfigInfo" id="BusStoreConfigInfoResult">
         <result property="id"    column="id"    />
+        <result property="storeId"    column="store_id"    />
         <result property="storeCode"    column="store_code"    />
         <result property="storeName"    column="store_name"    />
         <result property="content1"    column="content1"    />
@@ -25,12 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBusStoreConfigInfoVo">
-        select id, store_code, store_name, content1, content2, content3, content4, min_order_num, max_order_num, start_time, end_time, is_splice_order, self_delivery_duration, quota, quota_status, remark,sale_bind_id from bus_store_config_info
+        select id, store_id, store_code, store_name, content1, content2, content3, content4, min_order_num, max_order_num, start_time, end_time, is_splice_order, self_delivery_duration, quota, quota_status, remark,sale_bind_id from bus_store_config_info
     </sql>
 
     <select id="selectBusStoreConfigInfoList" parameterType="BusStoreConfigInfo" resultMap="BusStoreConfigInfoResult">
         <include refid="selectBusStoreConfigInfoVo"/>
-        <where>  
+        <where>
+            <if test="storeId != null  and storeId != ''"> and store_id = #{storeId}</if>
             <if test="storeCode != null  and storeCode != ''"> and store_code = #{storeCode}</if>
             <if test="storeName != null  and storeName != ''"> and store_name like concat('%', #{storeName}, '%')</if>
             <if test="content1 != null  and content1 != ''"> and content1 = #{content1}</if>
@@ -65,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into bus_store_config_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="storeId != null">store_id,</if>
             <if test="storeCode != null">store_code,</if>
             <if test="storeName != null">store_name,</if>
             <if test="content1 != null">content1,</if>
@@ -84,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="storeId != null">#{storeId},</if>
             <if test="storeCode != null">#{storeCode},</if>
             <if test="storeName != null">#{storeName},</if>
             <if test="content1 != null">#{content1},</if>
@@ -106,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateBusStoreConfigInfo" parameterType="BusStoreConfigInfo">
         update bus_store_config_info
         <trim prefix="SET" suffixOverrides=",">
+            <if test="storeId != null">store_id = #{storeId},</if>
             <if test="storeCode != null">store_code = #{storeCode},</if>
             <if test="storeName != null">store_name = #{storeName},</if>
             <if test="content1 != null">content1 = #{content1},</if>