From eae187c6c2b031afe78193ae5539b649460cad21 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Wed, 24 Jul 2024 20:36:41 +0800
Subject: [PATCH] =?UTF-8?q?1;history=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/framework/config/SecurityConfig.java   | 1 +
 .../ruoyi/business/service/impl/MeituanServiceImpl.java   | 4 ++--
 .../resources/mapper/business/BusStoreDayInfoMapper.xml   | 2 +-
 ruoyi-ui/src/views/market/whole/index.vue                 | 8 ++++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index daa7ff0..dfd245a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -137,6 +137,7 @@ public class SecurityConfig
                     .antMatchers(HttpMethod.POST,"/mt/cookies").permitAll()
                     .antMatchers("/test/**").permitAll()
                     .antMatchers("/eleme/message_receive").permitAll()
+                    .antMatchers(HttpMethod.GET,"/mt/getReturnInfo").permitAll()
 //                    .antMatchers("/mt/**").permitAll()
 //                    .antMatchers("/ai/**").permitAll()
 
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 e975fae..2833d90 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
@@ -753,8 +753,9 @@ public class MeituanServiceImpl implements IMeituanService {
 
     @Override
     public void getReturnInfo(Long id) {
+        getComments(null);
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        LocalDateTime date = LocalDateTime.now().minusDays(2);
+        LocalDateTime date = LocalDateTime.now().minusDays(1);
         BusStoreInfo storeInfo = new BusStoreInfo();
         if (id != null){
             storeInfo.setId(id);
@@ -792,7 +793,6 @@ public class MeituanServiceImpl implements IMeituanService {
                 }
             }
         }
-        getComments(null);
     }
 
     private String getRate(int a, int b){
diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml
index ec3e83d..71df701 100644
--- a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectBusStoreDayInfoVo"/>
         where store_id = #{id} and DATE_SUB(create_time, INTERVAL 1 DAY) between #{sT} and #{eT}
     </select>
-    <select id="selectBusStoreDayInfoListByDate" resultType="com.ruoyi.business.domain.BusStoreDayInfo">
+    <select id="selectBusStoreDayInfoListByDate" resultMap="BusStoreDayInfoResult">
         <include refid="selectBusStoreDayInfoVo"/>
         <where> DATE_FORMAT(create_time,'%Y-%m-%d') = #{date}
             <if test="storeId != null "> and store_id = #{storeId}</if>
diff --git a/ruoyi-ui/src/views/market/whole/index.vue b/ruoyi-ui/src/views/market/whole/index.vue
index 696a2a2..12d64b0 100644
--- a/ruoyi-ui/src/views/market/whole/index.vue
+++ b/ruoyi-ui/src/views/market/whole/index.vue
@@ -716,13 +716,17 @@ export default {
       await refresh().then(response => {
         this.$modal.msgSuccess("同步中...");
         this.handleQuery();
-      })
+      }).catch(function() {
+
+      });
     },
     async handleComment(row){
       await getComment(row.id).then(response => {
         this.$modal.msgSuccess("同步中...");
         this.handleQuery();
-      })
+      }).catch(function() {
+
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {