From 418d0c73e50fab62777b96fa8238348173040744 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Thu, 8 Aug 2024 16:51:50 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9B=E5=AE=9A=E6=97=B6=E6=B8=85=E7=90=86r?= =?UTF-8?q?edis=202=EF=BC=9B=E4=BF=9D=E5=AD=98=E5=BA=97=E9=93=BA=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=203=EF=BC=9B=E5=BA=97=E9=93=BA=E9=85=8D=E7=BD=AEstoreid?= =?UTF-8?q?=EF=BC=8C=E5=8D=95=E6=9D=A1=E5=BA=97=E9=93=BA=E5=90=8C=E6=AD=A5?= =?UTF-8?q?+=E6=9B=B4=E6=96=B0=E5=BA=97=E9=93=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/impl/AsyncTaskImpl.java | 4 +- .../service/impl/BusStoreInfoServiceImpl.java | 2 +- .../service/impl/MeituanServiceImpl.java | 42 ++++++++++--------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AsyncTaskImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AsyncTaskImpl.java index 9893e04..9134234 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AsyncTaskImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AsyncTaskImpl.java @@ -66,9 +66,9 @@ public class AsyncTaskImpl { public void clearStoreKey(){ LocalDate localDate = LocalDate.now(); - LocalDate prevDay = localDate.minusDays(1); + LocalDate prevDay = localDate.minusDays(2); BusStoreInfo busStoreInfo = new BusStoreInfo(); - List busStoreInfoList = busStoreInfoMapper.selectBusStoreInfoList(busStoreInfo); + List busStoreInfoList = busStoreInfoMapper.selectBusStoreInfoListA(busStoreInfo); for (BusStoreInfo storeInfo : busStoreInfoList) { try { String oldKey = storeInfo.getStoreCode() + "-" + prevDay; diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java index 77908c8..c61a3e5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusStoreInfoServiceImpl.java @@ -229,7 +229,7 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService }else if(ll.size() ==1){ busStoreConfigInfo.setId(ll.get(0).getId()); if(StringUtils.isEmpty(busStoreConfigInfo.getMarketingChannels())){ - throw new ServiceException("操作异常！"); + throw new ServiceException("请选择营销渠道！"); } if(!busStoreConfigInfo.getMarketingChannels().equals(ll.get(0).getMarketingChannels())){ BusMarketOperationInfo busMarketOperationInfo = new BusMarketOperationInfo(); 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 857af70..701325c 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 @@ -136,12 +136,13 @@ public class MeituanServiceImpl implements IMeituanService { storeInfo.setSelfDeliveryStatus("1");// 1 正常， 2 自配送， 3 删除 storeInfo.setMarketingChannels(sysDictDataMapper.selectDictLabel("bus_default_channel","default_channel")); busStoreInfoService.insertBusStoreInfo(storeInfo); + Long storeId = storeInfo.getId(); BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); - busStoreDayInfo.setStoreId(storeInfo.getId()); + busStoreDayInfo.setStoreId(storeId); busStoreDayInfo.setCreateTime(date); busStoreDayInfoMapper.insertBusStoreDayInfo(busStoreDayInfo); BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo(); - busStoreConfigInfo.setStoreId(storeInfo.getId()); + busStoreConfigInfo.setStoreId(storeId); busStoreConfigInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie())); busStoreConfigInfo.setStoreName(storeInfo.getStoreName()); busStoreConfigInfo.setQuotaStatus("2"); @@ -192,7 +193,11 @@ public class MeituanServiceImpl implements IMeituanService { storeInfo.setUpdateUser(cookie.getUserName()); storeInfo.setStoreAccount(cookie.getAccount()); storeInfo.setStorePassword(cookie.getPassword()); - storeInfo.setStoreName(cookie.getWmPoiName()); + String name = getStoreName(cookie.getCookie(),getUrl); + if(StringUtils.isEmpty(name)){ + name = getStoreNameApi(cookie.getCookie(),getUrl); + } + storeInfo.setStoreName(name); storeInfo.setStoreCookie(cookie.getCookie()); storeInfo.setBindTime(date); storeInfo.setGrantStatus("1");//授权登录状态 @@ -269,6 +274,12 @@ public class MeituanServiceImpl implements IMeituanService { @Transactional(rollbackFor = Exception.class) public String getComment(Long id) { BusStoreInfo store = busStoreInfoMapper.selectBusStoreInfoById(id); + String name = getStoreName(store.getStoreCookie(),""); + if(StringUtils.isEmpty(name)){ + name = getStoreNameApi(store.getStoreCookie(),""); + } + store.setStoreName(name); + busStoreInfoMapper.updateBusStoreInfo(store); Boolean flag1 = getScoreOne(store); if (!flag1) { log.error("获取评分信息返回错误..."); @@ -367,10 +378,6 @@ public class MeituanServiceImpl implements IMeituanService { temp.setLastOrderNum(Integer.valueOf(total)); temp.setCreateTime(Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant())); busStoreDayInfoService.updateBusStoreDayInfo(temp); - } else { - dayInfo.setLastOrderNum(Integer.valueOf(total)); - dayInfo.setCreateTime(Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant())); - busStoreDayInfoService.insertBusStoreDayInfo(dayInfo); } } } else if ("1001".equals(code)) { @@ -749,19 +756,18 @@ public class MeituanServiceImpl implements IMeituanService { HttpGet request = new HttpGet(url); request.setHeader("Cookie",cookie); request.setHeader("User-Agent","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"); - String result = null; + String info = null; try { - result = EntityUtils.toString(client.execute(request).getEntity()); + String result = EntityUtils.toString(client.execute(request).getEntity()); + JSONObject jsonObject = JSONObject.parseObject(result); + String code = jsonObject.getString(("code")); + if ("0".equals(code)) { + JSONArray data = jsonObject.getJSONArray("data"); + info = data.getJSONObject(0).getString("timeLine"); + } } catch (Exception e) { log.error("*********订单送达时间解析异常*********"); } - JSONObject jsonObject = JSONObject.parseObject(result); - String code = jsonObject.getString(("code")); - String info = null; - if ("0".equals(code)) { - JSONArray data = jsonObject.getJSONArray("data"); - info = data.getJSONObject(0).getString("timeLine"); - } return info; } @@ -974,10 +980,6 @@ public class MeituanServiceImpl implements IMeituanService { temp.setScore(poiScore); temp.setCreateTime(Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant())); busStoreDayInfoService.updateBusStoreDayInfo(temp); - } else { - dayInfo.setScore(poiScore); - dayInfo.setCreateTime(Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant())); - busStoreDayInfoService.insertBusStoreDayInfo(dayInfo); } } }else if ("1001".equals(jsonObject.getString("code"))) {