From d8fa117b4c5f7f0f308fef0c2caca3736ec5b877 Mon Sep 17 00:00:00 2001
From: wangshuai <daws172839@163.com>
Date: Sun, 28 Jul 2024 09:53:15 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E5=90=8C=E4=B8=80=E4=B8=AA=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86=E7=BB=91=E5=AE=9A=E5=B7=B2=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=20=E7=8A=B6=E6=80=81=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=90=A5=E9=94=80=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MeituanServiceImpl.java      | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 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 ea5e8bf..f04be7c 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
@@ -163,26 +163,6 @@ public class MeituanServiceImpl implements IMeituanService {
                 storeInfo.setReturnVisitStatus("2");// 营销状态
                 storeInfo.setSelfDeliveryStatus("1");
                 busStoreInfoMapper.updateBusStoreInfo(storeInfo);
-//                BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
-//                busStoreDayInfo.setStoreId(storeInfo.getId());
-//                busStoreDayInfo.setCreateTime(date);
-//                busStoreDayInfoMapper.insertBusStoreDayInfo(busStoreDayInfo);
-//                BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo();
-//                busStoreConfigInfo.setStoreId(storeInfo.getId());
-//                busStoreConfigInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie()));
-//                busStoreConfigInfo.setStoreName(storeInfo.getStoreName());
-//                busStoreConfigInfo.setQuotaStatus("2");
-//                busStoreConfigInfo.setIsSpliceOrder("N");
-//                String content = sysDictDataMapper.selectDictLabel("bus_default_script","default_script");
-//                busStoreConfigInfo.setContent1(content);
-//                busStoreConfigInfo.setContent2(content);
-//                busStoreConfigInfo.setContent3(content);
-//                busStoreConfigInfo.setContent4(content);
-//                busStoreConfigInfo.setStartTime("00:00:00");
-//                busStoreConfigInfo.setEndTime("23:59:59");
-//                busStoreConfigInfo.setMinOrderNum(1);
-//                busStoreConfigInfo.setMaxOrderNum(1);
-//                busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo);
             }else{
                 storeInfo = list.get(0);
                 storeInfo.setStoreAccount(cookie.getAccount());
@@ -195,6 +175,9 @@ public class MeituanServiceImpl implements IMeituanService {
                 storeInfo.setStoreName(cookie.getWmPoiName());
                 storeInfo.setStoreCookie(cookie.getCookie());
                 storeInfo.setGrantStatus("1");//授权登录状态
+                if("3".equals(storeInfo.getSelfDeliveryStatus())){
+                    storeInfo.setSelfDeliveryStatus("1");
+                }
                 busStoreInfoService.updateBusStoreInfo(storeInfo);
             }
         } else {
@@ -774,22 +757,9 @@ public class MeituanServiceImpl implements IMeituanService {
         }
         List<BusStoreInfo> storeInfoList = busStoreInfoMapper.selectBusStoreInfoListA(storeInfo);
         for (BusStoreInfo busStoreInfo : storeInfoList) {
-//            List<BusReturnVisitInfo> list = busReturnVisitInfoMapper.selectBusReturnVisitInfoListByDate(busStoreInfo.getStoreCode(), date.format(dateTimeFormatter));
-//            BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo();
-//            busStoreDayInfo.setStoreId(busStoreInfo.getId());
             List<BusStoreDayInfo> list1 = busStoreDayInfoMapper.selectBusStoreDayInfoListByDate(busStoreInfo.getId(),date.format(dateTimeFormatter));
             if (list1.size() == 1) {
                 BusStoreDayInfo busStoreDayInfo = list1.get(0);
-//                busStoreDayInfo.setLastReturnVisitNum(list.size());
-//                int a = busStoreDayInfo.getLastPositiveReviewsNum();//todo 好评-五星
-//                int b = busStoreDayInfo.getLastReturnVisitNum();
-//                if (a != 0 && b != 0) {
-//                    busStoreDayInfo.setLastReturnVisitRate(getRate(a,b));
-//                } else {
-//                    busStoreDayInfo.setLastReturnVisitRate("0");
-//                }
-//                busStoreDayInfo.setCreateTime(Date.from(date.atZone(ZoneId.systemDefault()).toInstant()));
-//                busStoreDayInfoMapper.updateBusStoreDayInfo(busStoreDayInfo);
                 List<BusStoreDayHistoryInfo> list2 = busStoreDayHistoryInfoMapper.selectBusStoreDayHistoryInfoListByDate(busStoreInfo.getId(),date.format(dateTimeFormatter));
                 if (list2.size() > 0){
                     BusStoreDayHistoryInfo target = new BusStoreDayHistoryInfo();