From f7f3da25aca69dc37af499f92fa9938855b9dbed Mon Sep 17 00:00:00 2001 From: wangshuai Date: Tue, 9 Jul 2024 19:41:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=85=B3=E8=81=94=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusStoreInfoController.java | 55 ++++++++++--------- .../mapper/BusReturnVisitInfoMapper.java | 2 + .../service/IBusReturnVisitInfoService.java | 2 + .../impl/BusReturnVisitInfoServiceImpl.java | 5 ++ .../service/impl/MeituanServiceImpl.java | 2 +- .../business/BusReturnVisitInfoMapper.xml | 7 +++ 6 files changed, 45 insertions(+), 28 deletions(-) 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 94d9394..f13261b 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 @@ -28,6 +28,8 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.stream.Collectors; @@ -78,33 +80,32 @@ public class BusStoreInfoController extends BaseController { } List list = busStoreInfoService.selectBusStoreInfoList(busStoreInfo); List tableList = list.stream() - .map(busStoreInfo1 -> { - RespBusStoreInfo info = new RespBusStoreInfo(busStoreInfo1); - BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); - busStoreDayInfo.setStoreId(info.getId()); - List ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo); - int a = ll.get(0).getLastReturnVisitNum(); - int b = ll.get(0).getLastOrderNum(); - info.setLastOrderNum(ll.get(0).getLastOrderNum()); - info.setLastPositiveReviewsNum(ll.get(0).getLastPositiveReviewsNum()); - info.setLastFiveStarReviewsNum(ll.get(0).getLastFiveStarReviewsNum()); - info.setLastReturnVisitNum(ll.get(0).getLastReturnVisitNum()); - info.setTodayReturnVisitNum(ll.get(0).getTodayReturnVisitNum()); - info.setScore(ll.get(0).getScore()); - if (b != 0 && a != 0) { - java.text.DecimalFormat df = new java.text.DecimalFormat("#.00"); - String formattedResult = df.format((double) a / b); - info.setLastReturnVisitRate(formattedResult); - } else { - info.setLastReturnVisitRate("0"); - } - BusReturnVisitInfo busReturnVisitInfo = new BusReturnVisitInfo(); - busReturnVisitInfo.setStoreCode(busStoreInfo1.getStoreCode()); - List lll = iBusReturnVisitInfoService.selectBusReturnVisitInfoList(busReturnVisitInfo); - info.setTodayReturnVisitNum(lll.size()); - return info; - }) - .collect(Collectors.toList()); + .map(busStoreInfo1 -> { + RespBusStoreInfo info = new RespBusStoreInfo(busStoreInfo1); + BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); + busStoreDayInfo.setStoreId(info.getId()); + List ll = busStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo); + int b = ll.get(0).getLastOrderNum(); + info.setLastOrderNum(ll.get(0).getLastOrderNum()); + info.setLastPositiveReviewsNum(ll.get(0).getLastPositiveReviewsNum()); + info.setLastFiveStarReviewsNum(ll.get(0).getLastFiveStarReviewsNum()); + String date = LocalDateTime.now().minusDays(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + List llll = iBusReturnVisitInfoService.selectBusReturnVisitInfoListByDate(busStoreInfo1.getStoreCode(),date); + info.setLastReturnVisitNum(llll.size()); + info.setScore(ll.get(0).getScore()); + if (b != 0 && llll.size() != 0) { + java.text.DecimalFormat df = new java.text.DecimalFormat("0.00"); + String formattedResult = df.format(((double) llll.size() / b)*100); + info.setLastReturnVisitRate(formattedResult); + } else { + info.setLastReturnVisitRate("0"); + } + String today = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); + List lll = iBusReturnVisitInfoService.selectBusReturnVisitInfoListByDate(busStoreInfo1.getStoreCode(),today); + info.setTodayReturnVisitNum(lll.size()); + return info; + }) + .collect(Collectors.toList()); tableList.forEach(System.out::println); return getDataTable(tableList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java index c4c26cb..0205dab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/mapper/BusReturnVisitInfoMapper.java @@ -62,4 +62,6 @@ public interface BusReturnVisitInfoMapper */ public int deleteBusReturnVisitInfoByIds(Long[] ids); int batchInsertVisit(@Param("ls") List ls); + + List selectBusReturnVisitInfoListByDate(@Param("storeCode") String storeCode,@Param("date") String date); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java index 2fac615..55c7282 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusReturnVisitInfoService.java @@ -58,4 +58,6 @@ public interface IBusReturnVisitInfoService * @return 结果 */ public int deleteBusReturnVisitInfoById(Long id); + + List selectBusReturnVisitInfoListByDate(String storeCode, String date); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java index eaac52e..ccb8908 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java @@ -90,4 +90,9 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService { return busReturnVisitInfoMapper.deleteBusReturnVisitInfoById(id); } + + @Override + public List selectBusReturnVisitInfoListByDate(String storeCode, String date) { + return busReturnVisitInfoMapper.selectBusReturnVisitInfoListByDate(storeCode,date); + } } 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 ad3d746..a75ff42 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 @@ -198,7 +198,7 @@ public class MeituanServiceImpl implements IMeituanService { */ @Override public String orderInfoList() { - LocalDateTime now = LocalDateTime.now().minusDays(1); + LocalDateTime now = LocalDateTime.now(); BusStoreInfo busStoreInfo = new BusStoreInfo(); busStoreInfo.setGrantStatus("1"); List busStoreInfoList = busStoreInfoMapper.selectBusStoreInfoList(busStoreInfo); diff --git a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml index 6e8d187..6244641 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusReturnVisitInfoMapper.xml @@ -34,6 +34,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + insert into bus_return_visit_info (store_code,store_name,phone_number,phone_end_number,return_visit_time) values