From 0a57ca9eb79cbc7d1eebc45100bfcfa1dd6e7722 Mon Sep 17 00:00:00 2001 From: wangshuai Date: Fri, 2 Aug 2024 18:59:36 +0800 Subject: [PATCH] =?UTF-8?q?3;=20=E5=BA=97=E9=93=BA=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=20-=20=E5=B7=AE=E5=AF=BC=E5=87=BA=204;=20?= =?UTF-8?q?=E8=90=A5=E9=94=80=E8=AE=B0=E5=BD=95=20-=20=E5=B7=AE=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusStoreInfoController.java | 66 ++++--------------- .../domain/resp/RespBusStoreHistoryInfo.java | 17 ++--- .../service/IBusStoreInfoService.java | 2 + .../service/impl/BusStoreInfoServiceImpl.java | 6 ++ ruoyi-ui/src/views/statistics/shop/index.vue | 4 +- 5 files changed, 33 insertions(+), 62 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 a094417..68a77af 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 @@ -290,63 +290,25 @@ public class BusStoreInfoController extends BaseController { if (!"admin".equals(user.getUsername())) { busStoreInfo.setBindUser(user.getUsername()); } -// 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).getLastPositiveReviewsNum();//todo 好评-五星 -// int b = ll.get(0).getLastReturnVisitNum(); -// info.setLastOrderNum(ll.get(0).getLastOrderNum()); -// info.setLastReturnVisitNum(b); -// info.setLastPositiveReviewsNum(a); -// 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 (a != 0 && b != 0) { -// info.setLastReturnVisitRate(getRate(a,b)); -// } 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()); -// BusStoreConfigInfo busStoreConfigInfo = new BusStoreConfigInfo(); -// busStoreConfigInfo.setStoreCode(busStoreInfo1.getStoreCode()); -// List list1 = iBusStoreConfigInfoService.selectBusStoreConfigInfoList(busStoreConfigInfo); -// if(list1.size() == 1){ -// info.setReturnVisitUserRange(list1.get(0).getMinOrderNum()+"~"+list1.get(0).getMaxOrderNum()); -// } -// if("1".equals(info.getPlatformType())){ -// info.setPlatformType("美团"); -// } -// if ("1".equals(info.getGrantStatus())){ -// info.setGrantStatus("在线"); -// }else if("2".equals(info.getGrantStatus())){ -// info.setGrantStatus("掉线"); -// } -// if ("1".equals(info.getReturnVisitStatus())){ -// info.setReturnVisitStatus("开启"); -// }else if("2".equals(info.getReturnVisitStatus())){ -// info.setReturnVisitStatus("关闭"); -// } -// if ("1".equals(info.getSelfDeliveryStatus())){ -// info.setSelfDeliveryStatus("正常"); -// }else if("2".equals(info.getSelfDeliveryStatus())){ -// info.setSelfDeliveryStatus("自配送"); -// } -// return info; -// }) -// .collect(Collectors.toList()); List listNew = busStoreInfoService.storeStatisticsExport(busStoreInfo); ExcelUtil util = new ExcelUtil<>(RespBusStoreInfo.class); util.exportExcel(response, listNew, "店铺信息"); } + + @Log(title = "店铺历史信息", businessType = BusinessType.EXPORT) + @PostMapping("/storeHistoryStatisticsExport") + public void storeHistoryStatisticsExport(ReqBusStoreInfo reqBusStoreInfo,HttpServletResponse response) throws Exception { + BusStoreInfo busStoreInfo = new BusStoreInfo(); + BeanUtils.copyProperties(reqBusStoreInfo, busStoreInfo); + LoginUser user = SecurityUtils.getLoginUser(); + if (!"admin".equals(user.getUsername())) { + busStoreInfo.setBindUser(user.getUsername()); + } + List listNew = busStoreInfoService.storeHistoryStatisticsExport(busStoreInfo); + ExcelUtil util = new ExcelUtil<>(RespBusStoreHistoryInfo.class); + util.exportExcel(response, listNew, "店铺单日统计信息"); + } /** * 获取店铺信息详细信息 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java b/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java index 4428256..03618b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/domain/resp/RespBusStoreHistoryInfo.java @@ -67,25 +67,26 @@ public class RespBusStoreHistoryInfo { @JSONField(ordinal = 8) private String lastReturnVisitRate; + + /** 评分 */ + @Excel(name = "评分") + @JSONField(ordinal = 9) + private String score; + /** 金额 */ @Excel(name = "金额") - @JSONField(ordinal = 9) + @JSONField(ordinal = 10) private int price; /** - * 绑定时间（创建） + * 统计时间（创建） */ - @Excel(name = "金额") + @Excel(name = "统计时间") @JSONField(ordinal = 10) @JsonFormat(pattern = "yyyy-MM-dd") private Date bindTime; - /** 评分 */ - @Excel(name = "评分") - @JSONField(ordinal = 11) - private String score; - } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java index e2c0bb4..5f1a4cc 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IBusStoreInfoService.java @@ -91,4 +91,6 @@ public interface IBusStoreInfoService List storeHistoryStatistics(BusStoreInfo busStoreInfo); int changeStoreStatus(BusStoreInfo busStoreInfo); + + List storeHistoryStatisticsExport(BusStoreInfo busStoreInfo); } 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 9dc5a30..1b850c4 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 @@ -159,6 +159,12 @@ public class BusStoreInfoServiceImpl implements IBusStoreInfoService busStoreInfo.setUpdateTime(DateUtils.getNowDate()); return busStoreInfoMapper.updateBusStoreInfo(busStoreInfo); } + + @Override + public List storeHistoryStatisticsExport(BusStoreInfo busStoreInfo) { + return busStoreInfoMapper.storeHistoryStatisticsExport(busStoreInfo); + } + @Override public int lastPositiveReviewsNum(String agentAccount) { return busStoreInfoMapper.lastPositiveReviewsNum(agentAccount); diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue index 6c6de89..ac93b3a 100644 --- a/ruoyi-ui/src/views/statistics/shop/index.vue +++ b/ruoyi-ui/src/views/statistics/shop/index.vue @@ -662,8 +662,8 @@ export default { }, /** 导出按钮操作 */ handleExport(data) { - this.download('business/store/export', { - ...this.queryParams1 + this.download('business/store/storeHistoryStatisticsExport', { + ...this.queryParams }, `store_${new Date().getTime()}.xlsx`) } }