From b8f9fef5bc8e7e1cd7f0cb7e9d6546921e39ef17 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Tue, 23 Jul 2024 02:38:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E9=94=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MeituanController.java | 3 +- .../mapper/BusStoreDayInfoMapper.java | 2 + .../business/mapper/BusStoreInfoMapper.java | 3 + .../service/impl/MeituanServiceImpl.java | 73 +++++++++++++------ .../mapper/business/BusStoreDayInfoMapper.xml | 6 ++ .../mapper/business/BusStoreInfoMapper.xml | 28 +++++++ ruoyi-ui/src/views/market/whole/index.vue | 1 + 7 files changed, 91 insertions(+), 25 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java index 35037ed..c7e6406 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/MeituanController.java @@ -46,8 +46,8 @@ public class MeituanController { @Async @GetMapping("/refresh") public R refresh(){ +// iMeituanService.getReturnInfo(null);//店铺id iMeituanService.getComments(null); - iMeituanService.getReturnInfo(null);//店铺id return R.ok(); } @@ -57,7 +57,6 @@ public class MeituanController { @GetMapping("/getComment") public R getComment(Long id){ iMeituanService.getComment(id);//店铺id - iMeituanService.getReturnInfo(id);//店铺id return R.ok(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreDayInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreDayInfoMapper.java index 814fe4c..9a39b3a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreDayInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreDayInfoMapper.java @@ -62,4 +62,6 @@ public interface BusStoreDayInfoMapper */ public int deleteBusStoreDayInfoByIds(Long[] ids); BusStoreDayInfo getByDate(@Param("id") Long id, @Param("sT") String sT, @Param("eT") String eT); + + List selectBusStoreDayInfoListByDate(@Param("storeId") Long storeId,@Param("date") String date); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java index 2120749..acdd248 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusStoreInfoMapper.java @@ -26,7 +26,10 @@ public interface BusStoreInfoMapper * @param busStoreInfo 店铺信息 * @return 店铺信息集合 */ + public List selectBusStoreInfoListA(BusStoreInfo busStoreInfo); + public List selectBusStoreInfoList(BusStoreInfo busStoreInfo); + int lastUserIntegralNum(@Param("agentAccount") String agentAccount,@Param("startTime") String startTime,@Param("endTime") String endTime); /** 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 8d02a7c..a230226 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 @@ -216,7 +216,7 @@ public class MeituanServiceImpl implements IMeituanService { if(accountName != null){ busStoreInfo.setBindUser(SecurityUtils.getUsername()); } - List busStoreInfoList = busStoreInfoMapper.selectBusStoreInfoList(busStoreInfo); + List busStoreInfoList = busStoreInfoMapper.selectBusStoreInfoListA(busStoreInfo); for (BusStoreInfo store : busStoreInfoList) { Boolean flag1 = getScoreOne(store); if (!flag1) { @@ -228,7 +228,11 @@ public class MeituanServiceImpl implements IMeituanService { } Boolean flag3 = yesterdayCountOne(store); if (!flag3) { - System.out.println("获取昨日统计信息返回错误..."); + System.out.println("获取昨日单量信息返回错误..."); + } + Boolean flag4 = updateDayInfo(store); + if (!flag4) { + System.out.println("获取昨日营销信息返回错误..."); } } return "ok"; @@ -690,32 +694,30 @@ 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(1); + LocalDateTime date = LocalDateTime.now().minusDays(2); BusStoreInfo storeInfo = new BusStoreInfo(); if (id != null){ storeInfo.setId(id); } - List storeInfoList = busStoreInfoMapper.selectBusStoreInfoList(storeInfo); + List storeInfoList = busStoreInfoMapper.selectBusStoreInfoListA(storeInfo); for (BusStoreInfo busStoreInfo : storeInfoList) { - List list = busReturnVisitInfoMapper.selectBusReturnVisitInfoListByDate(busStoreInfo.getStoreCode(), date.format(dateTimeFormatter)); - BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); - busStoreDayInfo.setStoreId(busStoreInfo.getId()); - List list1 = busStoreDayInfoMapper.selectBusStoreDayInfoList(busStoreDayInfo); +// List list = busReturnVisitInfoMapper.selectBusReturnVisitInfoListByDate(busStoreInfo.getStoreCode(), date.format(dateTimeFormatter)); +// BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); +// busStoreDayInfo.setStoreId(busStoreInfo.getId()); + List list1 = busStoreDayInfoMapper.selectBusStoreDayInfoListByDate(busStoreInfo.getId(),date.format(dateTimeFormatter)); if (list1.size() == 1) { - 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); - + 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 list2 = busStoreDayHistoryInfoMapper.selectBusStoreDayHistoryInfoListByDate(busStoreInfo.getId(),date.format(dateTimeFormatter)); if (list2.size() > 0){ BusStoreDayHistoryInfo target = new BusStoreDayHistoryInfo(); @@ -731,6 +733,7 @@ public class MeituanServiceImpl implements IMeituanService { } } } + getComments(null); } private String getRate(int a, int b){ @@ -738,6 +741,30 @@ public class MeituanServiceImpl implements IMeituanService { return df.format(((double) a / b)*100); } + @Transactional(rollbackFor = Exception.class) + public Boolean updateDayInfo(BusStoreInfo store){ + String date = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + List llll = busReturnVisitInfoMapper.selectBusReturnVisitInfoListByDate(store.getStoreCode(),date); + BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); + busStoreDayInfo.setStoreId(store.getId()); + List ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo); + int a = ll.get(0).getLastPositiveReviewsNum();//todo 好评-五星 + int b = llll.size(); + busStoreDayInfo.setId(ll.get(0).getId()); + busStoreDayInfo.setLastOrderNum(ll.get(0).getLastOrderNum()); + busStoreDayInfo.setLastPositiveReviewsNum(a); + busStoreDayInfo.setLastFiveStarReviewsNum(ll.get(0).getLastFiveStarReviewsNum()); + busStoreDayInfo.setLastReturnVisitNum(b); + busStoreDayInfo.setScore(ll.get(0).getScore()); + if (a != 0 && b != 0) { + busStoreDayInfo.setLastReturnVisitRate(getRate(a,b)); + } else { + busStoreDayInfo.setLastReturnVisitRate("0"); + } + busStoreDayInfo.setCreateTime(Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant())); + busStoreDayInfoService.updateBusStoreDayInfo(busStoreDayInfo); + return true; + } /** * 获取评分单条 * @@ -832,8 +859,8 @@ public class MeituanServiceImpl implements IMeituanService { return false; } JSONObject jsonObject = JSONObject.parseObject(result); - int code = jsonObject.getInteger(("code")); - if (code != 0) { + String code = jsonObject.getString(("code")); + if ("1001".equals(code)) { System.out.println(result); store.setGrantStatus("2"); busStoreInfoService.updateBusStoreInfo(store); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml index f0d6824..ec3e83d 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreDayInfoMapper.xml @@ -99,5 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where store_id = #{id} and DATE_SUB(create_time, INTERVAL 1 DAY) between #{sT} and #{eT} + diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml index 76ee8b4..bfa4265 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml @@ -34,6 +34,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, platform_type, store_code, store_name, store_account, store_password, store_cookie, store_belong, grant_status, return_visit_status, bind_id, bind_user, bind_time, update_id, update_user, update_time, self_delivery_status, return_visit_user_range, sale_bind_id, sale_bind_name, sale_bind_time, price,marketing_channels from bus_store_info + +