From fd95869a59e1eb59ed32d5e9d73b2bda03556892 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Fri, 12 Jul 2024 16:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=B6=88=E8=80=97=E6=B8=85?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MeituanServiceImpl.java | 55 +++++++++++++------ ruoyi-ui/src/views/agent/list/index.vue | 14 +++-- ruoyi-ui/src/views/statistics/visit/index.vue | 4 +- 3 files changed, 48 insertions(+), 25 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 8941d69..2d3d085 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 @@ -94,6 +94,7 @@ public class MeituanServiceImpl implements IMeituanService { BusAgentInfo busAgentInfo = new BusAgentInfo(); busAgentInfo.setAgentAccount(cookie.getUserName()); List list1 = iBusAgentInfoService.selectBusAgentInfoList(busAgentInfo); + Date date = new Date(); if (list.size() == 0) { storeInfo.setBindId(list1.get(0).getId()); storeInfo.setBindUser(cookie.getUserName()); @@ -102,25 +103,25 @@ public class MeituanServiceImpl implements IMeituanService { storeInfo.setStoreName(cookie.getWmPoiName()); storeInfo.setStoreCookie(cookie.getCookie()); storeInfo.setPlatformType(String.valueOf(cookie.getBingType())); - storeInfo.setBindTime(new Date()); - storeInfo.setUpdateTime(new Date()); + storeInfo.setBindTime(date); + storeInfo.setUpdateTime(date); storeInfo.setGrantStatus("1");//授权登录状态 storeInfo.setReturnVisitStatus("2");// 营销状态 storeInfo.setSelfDeliveryStatus("1");// 1 正常， 2 自配送， 3 删除 busStoreInfoService.insertBusStoreInfo(storeInfo); BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); busStoreDayInfo.setStoreId(storeInfo.getId()); - busStoreDayInfo.setCreateTime(new Date()); + busStoreDayInfo.setCreateTime(date); busStoreDayInfoMapper.insertBusStoreDayInfo(busStoreDayInfo); BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo(); busStoreConfigInfo.setStoreCode(valueFromCookie("wmPoiId", cookie.getCookie())); busStoreConfigInfoMapper.insertBusStoreConfigInfo(busStoreConfigInfo); - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - throw new RuntimeException(e); - } +// try { +// Thread.sleep(3000); +// } catch (InterruptedException e) { +// throw new RuntimeException(e); +// } // getCommentsOne(storeInfo); // getScoreOne(storeInfo); // yesterdayCountOne(storeInfo); @@ -128,17 +129,35 @@ public class MeituanServiceImpl implements IMeituanService { return R.ok(); } else if (list.size() == 1) { if (!cookie.getUserName().equals(list.get(0).getBindUser())) { - throw new ServiceException("授权失败，已绑定其他代理账号！"); + if(!"3".equals(list.get(0).getSelfDeliveryStatus())){ + throw new ServiceException("授权失败，已绑定其他代理账号！"); + } + storeInfo.setId(list.get(0).getId()); + storeInfo.setBindId(list1.get(0).getId()); + storeInfo.setBindUser(cookie.getUserName()); + storeInfo.setStoreAccount(cookie.getAccount()); + storeInfo.setStorePassword(cookie.getPassword()); + storeInfo.setUpdateTime(date); + storeInfo.setUpdateId(list1.get(0).getId()); + storeInfo.setUpdateUser(cookie.getUserName()); + storeInfo.setStoreAccount(cookie.getAccount()); + storeInfo.setStorePassword(cookie.getPassword()); + storeInfo.setStoreName(cookie.getWmPoiName()); + storeInfo.setStoreCookie(cookie.getCookie()); + storeInfo.setGrantStatus("1");//授权登录状态 + }else{ + storeInfo.setId(list.get(0).getId()); + storeInfo.setStoreAccount(cookie.getAccount()); + storeInfo.setStorePassword(cookie.getPassword()); + storeInfo.setUpdateTime(date); + storeInfo.setUpdateId(list1.get(0).getId()); + storeInfo.setUpdateUser(cookie.getUserName()); + storeInfo.setStoreAccount(cookie.getAccount()); + storeInfo.setStorePassword(cookie.getPassword()); + storeInfo.setStoreName(cookie.getWmPoiName()); + storeInfo.setStoreCookie(cookie.getCookie()); + storeInfo.setGrantStatus("1");//授权登录状态 } - storeInfo.setId(list.get(0).getId()); - storeInfo.setUpdateTime(new Date()); - storeInfo.setUpdateId(list1.get(0).getId()); - storeInfo.setUpdateUser(cookie.getUserName()); - storeInfo.setStoreAccount(cookie.getAccount()); - storeInfo.setStorePassword(cookie.getPassword()); - storeInfo.setStoreName(cookie.getWmPoiName()); - storeInfo.setStoreCookie(cookie.getCookie()); - storeInfo.setGrantStatus("1");//授权登录状态 return R.ok(busStoreInfoService.updateBusStoreInfo(storeInfo)); } else { throw new ServiceException("授权失败，请重试！"); diff --git a/ruoyi-ui/src/views/agent/list/index.vue b/ruoyi-ui/src/views/agent/list/index.vue index 39f9fef..5af8ee5 100644 --- a/ruoyi-ui/src/views/agent/list/index.vue +++ b/ruoyi-ui/src/views/agent/list/index.vue @@ -117,10 +117,10 @@ - + - + @@ -139,7 +139,7 @@ /> - + @@ -237,15 +237,19 @@ export default { agentName: null, superiorAgentCode: null, superiorAgentAccount: null, - grantStoreNum: null, + deptId: null, operateStoreNum: null, lastUseIntegralNum: null, lastPositiveReviewsNum: null, aiDurationBalance: null, + aiDurationBalance1: null, lastLoginTime: null, lastLoginIp: null, loginNum: null, - delStatus: null + delStatus: null, + phoneNumber: null, + confirmPassword: null, + password: null, }; this.resetForm("form"); }, diff --git a/ruoyi-ui/src/views/statistics/visit/index.vue b/ruoyi-ui/src/views/statistics/visit/index.vue index 235d85a..719db65 100644 --- a/ruoyi-ui/src/views/statistics/visit/index.vue +++ b/ruoyi-ui/src/views/statistics/visit/index.vue @@ -58,8 +58,8 @@ - - + +