From b3f2735a29a4243b5030755ec4fa2e1989be15d6 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Sat, 20 Jul 2024 14:25:35 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=9Btable=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusAgentInfoController.java | 4 +- .../controller/BusSaleInfoController.java | 50 +++++++++---------- .../controller/BusStoreInfoController.java | 4 +- .../business/service/impl/AiServiceImpl.java | 16 +++++- ruoyi-ui/src/views/statistics/visit/index.vue | 4 +- 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java index 1e81155..33dbb2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusAgentInfoController.java @@ -70,7 +70,7 @@ public class BusAgentInfoController extends BaseController { busAgentInfo.setSuperiorAgentCode(user.getUserId()); } List list = busAgentInfoService.selectBusAgentInfoList(busAgentInfo); - List listData = list.stream().map(bean -> { + list = list.stream().map(bean -> { BusStoreInfo busStoreInfo = new BusStoreInfo(); busStoreInfo.setBindUser(bean.getAgentAccount()); List ll = iBusStoreInfoService.selectBusStoreInfoList(busStoreInfo); @@ -101,7 +101,7 @@ public class BusAgentInfoController extends BaseController { bean.setLoginNum(llll.size()); return bean; }).collect(Collectors.toList()); - return getDataTable(listData); + return getDataTable(list); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java index ea7992a..86ecd2d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusSaleInfoController.java @@ -60,33 +60,31 @@ public class BusSaleInfoController extends BaseController busSaleInfo.setCreateId(SecurityUtils.getUserId()); } List list = busSaleInfoService.selectBusSaleInfoList(busSaleInfo); - List tableList = list.stream() - .map(info -> { - BusStoreInfo busStoreInfo = new BusStoreInfo(); - busStoreInfo.setSaleBindId(info.getId()); - int lastFiveNum = 0; - int lastOrderNum = 0; - int lastReturnVisitNum = 0; - List ll = iBusStoreInfoService.selectBusStoreInfoList(busStoreInfo); - for (BusStoreInfo b:ll) { - BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); - busStoreDayInfo.setStoreId(b.getId()); - List dayList = iBusStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo); - if(dayList.size() == 1){ - lastFiveNum = dayList.get(0).getLastFiveStarReviewsNum() + lastFiveNum; - lastOrderNum = dayList.get(0).getLastOrderNum() + lastOrderNum; - lastReturnVisitNum = dayList.get(0).getLastReturnVisitNum() + lastReturnVisitNum; - } - } - info.setStoreNum(ll.size()); - info.setLastOrderNum(lastOrderNum); - info.setFiveStarReviewsNum(lastFiveNum); - info.setReturnVisitNum(lastReturnVisitNum); - return info; - }) - .collect(Collectors.toList()); + list = list.stream().map(info -> { + BusStoreInfo busStoreInfo = new BusStoreInfo(); + busStoreInfo.setSaleBindId(info.getId()); + int lastFiveNum = 0; + int lastOrderNum = 0; + int lastReturnVisitNum = 0; + List ll = iBusStoreInfoService.selectBusStoreInfoList(busStoreInfo); + for (BusStoreInfo b:ll) { + BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); + busStoreDayInfo.setStoreId(b.getId()); + List dayList = iBusStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo); + if(dayList.size() == 1){ + lastFiveNum = dayList.get(0).getLastFiveStarReviewsNum() + lastFiveNum; + lastOrderNum = dayList.get(0).getLastOrderNum() + lastOrderNum; + lastReturnVisitNum = dayList.get(0).getLastReturnVisitNum() + lastReturnVisitNum; + } + } + info.setStoreNum(ll.size()); + info.setLastOrderNum(lastOrderNum); + info.setFiveStarReviewsNum(lastFiveNum); + info.setReturnVisitNum(lastReturnVisitNum); + return info; + }).collect(Collectors.toList()); // tableList.forEach(System.out::println); - return getDataTable(tableList); + return getDataTable(list); // return getDataTable(list); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java index a68fc52..f91ae2f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java @@ -117,6 +117,7 @@ public class BusStoreInfoController extends BaseController { busStoreInfo.setBindUser(user.getUsername()); } List list = busStoreInfoService.selectBusStoreInfoList(busStoreInfo); + TableDataInfo rspData = getDataTable(list); List tableList = list.stream() .map(busStoreInfo1 -> { RespBusStoreInfo info = new RespBusStoreInfo(busStoreInfo1); @@ -151,7 +152,8 @@ public class BusStoreInfoController extends BaseController { }) .collect(Collectors.toList()); // tableList.forEach(System.out::println); - return getDataTable(tableList); + rspData.setRows(tableList); + return rspData; } @ApiOperation("查询店铺信息列表") diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java index 4827546..4e47071 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/AiServiceImpl.java @@ -156,7 +156,7 @@ public class AiServiceImpl implements IAiService { } @Override - @Transactional + @Transactional(rollbackFor = RuntimeException.class) public void queryAiTask() { String url = "https://ai002.ciopaas.com/api/login"; String userName = "zw982210"; @@ -210,6 +210,7 @@ public class AiServiceImpl implements IAiService { // } } catch (Exception e) { System.out.println(id + "duplicate"); + throw new RuntimeException(); } } } else { @@ -316,12 +317,24 @@ public class AiServiceImpl implements IAiService { LocalTime time3 = LocalTime.of(14, 00, 00); LocalTime time4 = LocalTime.of(17, 00, 00); if (time1.isBefore(orderTime) && orderTime.isBefore(time2)) { + if(busStoreConfigInfo.getContent1()==null){ + continue; + } content = busStoreConfigInfo.getContent1(); } else if (time2.isBefore(orderTime) && orderTime.isBefore(time3)) { + if(busStoreConfigInfo.getContent2()==null){ + continue; + } content = busStoreConfigInfo.getContent2(); } else if (time3.isBefore(orderTime) && orderTime.isBefore(time4)) { + if(busStoreConfigInfo.getContent3()==null){ + continue; + } content = busStoreConfigInfo.getContent3(); } else { + if(busStoreConfigInfo.getContent4()==null){ + continue; + } content = busStoreConfigInfo.getContent4(); } @@ -352,7 +365,6 @@ public class AiServiceImpl implements IAiService { int a = 1; int reduce = busAgentInfo.getAiDurationBalance() - a; busAgentInfo.setAiDurationBalance(reduce); - busAgentInfo.setAiRealTimeNum(0); agentInfoService.updateBusAgentInfo(busAgentInfo); BusIntegralRecord record = new BusIntegralRecord(); diff --git a/ruoyi-ui/src/views/statistics/visit/index.vue b/ruoyi-ui/src/views/statistics/visit/index.vue index 77239be..7de29be 100644 --- a/ruoyi-ui/src/views/statistics/visit/index.vue +++ b/ruoyi-ui/src/views/statistics/visit/index.vue @@ -19,7 +19,7 @@ @keyup.enter.native="handleQuery" /> - +