From 06ec01b8bc78b0a6c9cfb3ffeb7172d17330498c Mon Sep 17 00:00:00 2001 From: wangshuai Date: Thu, 11 Jul 2024 16:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20orderlist=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BusStoreInfoController.java | 4 +-- .../controller/MeituanController.java | 2 +- .../java/com/ruoyi/quartz/task/RyTask.java | 17 ++--------- .../business/service/IMeituanService.java | 1 + .../service/impl/MeituanServiceImpl.java | 29 +++++++++++++++++-- ruoyi-ui/src/views/market/self/index.vue | 1 + ruoyi-ui/src/views/market/whole/index.vue | 1 + ruoyi-ui/src/views/statistics/black/index.vue | 2 +- ruoyi-ui/src/views/statistics/shop/index.vue | 1 + 9 files changed, 36 insertions(+), 22 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 202b6f7..b8630e4 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 @@ -77,8 +77,8 @@ public class BusStoreInfoController extends BaseController { BusStoreInfo storeInfo = new BusStoreInfo(); storeInfo.setBindId(loginUserId); List list = busStoreInfoService.selectBusStoreInfoList(storeInfo); - List openCount = list.stream().filter(x -> x.getReturnVisitStatus() == "1").collect(Collectors.toList()); - List noGrantCount = list.stream().filter(x -> x.getGrantStatus() == "2").collect(Collectors.toList()); + List openCount = list.stream().filter(x -> "1".equals(x.getReturnVisitStatus())).collect(Collectors.toList()); + List noGrantCount = list.stream().filter(x -> "2".equals(x.getGrantStatus())).collect(Collectors.toList()); data.put("storeCount",list.size()); data.put("openCount",openCount.size()); data.put("noGrantCount",noGrantCount.size()); 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 871d782..4610baf 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 @@ -39,7 +39,7 @@ public class MeituanController { iMeituanService.getScore(); iMeituanService.getComments(); iMeituanService.getYestodayCount(); - iMeituanService.orderInfoList(); +// iMeituanService.orderInfoList(); return R.ok(); } /** diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java index bf33890..a84c212 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java @@ -72,21 +72,8 @@ public class RyTask { * 统计昨日营销数 每天8点执行一次 */ public void getReturnInfo() { - DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - LocalDateTime date = LocalDateTime.now().minusDays(1); - BusStoreInfo storeInfo = new BusStoreInfo(); - List storeInfoList = storeInfoService.selectBusStoreInfoList(storeInfo); - for (BusStoreInfo busStoreInfo : storeInfoList) { - List list = iBusReturnVisitInfoService.selectBusReturnVisitInfoListByDate(busStoreInfo.getStoreCode(), date.format(dateTimeFormatter)); - BusStoreDayInfo busStoreDayInfo = new BusStoreDayInfo(); - busStoreDayInfo.setStoreId(busStoreInfo.getId()); - List list1 = iBusStoreDayInfoService.selectBusStoreDayInfoList(busStoreDayInfo); - if (list1.size() == 1) { - busStoreDayInfo = list1.get(0); - busStoreDayInfo.setLastReturnVisitNum(list.size()); - iBusStoreDayInfoService.updateBusStoreDayInfo(busStoreDayInfo); - } - } + iMeituanService.getReturnInfo(); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java index aaf15cf..4cfcd43 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/IMeituanService.java @@ -59,4 +59,5 @@ public interface IMeituanService { */ String mtgsigInfo(String orderId,String regionId,String regionVersion); + void getReturnInfo(); } 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 8563771..6987592 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 @@ -27,6 +27,7 @@ import org.apache.http.entity.StringEntity; import org.apache.http.entity.mime.MultipartEntityBuilder; import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.apache.ibatis.javassist.Loader; @@ -419,8 +420,8 @@ public class MeituanServiceImpl implements IMeituanService { httpPost.setEntity(entity); httpPost.setHeader("Cookie", cookie); - HttpClient client = proxyHttpClient(); - +// CloseableHttpClient client = proxyHttpClient(); + CloseableHttpClient client = HttpClientBuilder.create().build(); HttpEntity responseEntity; String resp = null; JSONObject jsonObject = new JSONObject(); @@ -465,7 +466,7 @@ public class MeituanServiceImpl implements IMeituanService { httpPost.setEntity(entity); httpPost.setHeader("Cookie", cookie); - HttpClient client = proxyHttpClient(); + CloseableHttpClient client = proxyHttpClient(); String resp = null; try { @@ -572,6 +573,28 @@ public class MeituanServiceImpl implements IMeituanService { return URLEncoder.encode(result); } + @Override + public void getReturnInfo() { + getScore(); + getComments(); + getYestodayCount(); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDateTime date = LocalDateTime.now().minusDays(1); + BusStoreInfo storeInfo = new BusStoreInfo(); + List storeInfoList = busStoreInfoMapper.selectBusStoreInfoList(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); + if (list1.size() == 1) { + busStoreDayInfo = list1.get(0); + busStoreDayInfo.setLastReturnVisitNum(list.size()); + busStoreDayInfoMapper.updateBusStoreDayInfo(busStoreDayInfo); + } + } + } + /** * 获取评分单条 * diff --git a/ruoyi-ui/src/views/market/self/index.vue b/ruoyi-ui/src/views/market/self/index.vue index 0803ae0..0e76a99 100644 --- a/ruoyi-ui/src/views/market/self/index.vue +++ b/ruoyi-ui/src/views/market/self/index.vue @@ -544,6 +544,7 @@ export default { handleQuery() { this.queryParams.pageNum = 1; this.getList(); + this.storeStatistics(); }, /** 重置按钮操作 */ resetQuery() { diff --git a/ruoyi-ui/src/views/market/whole/index.vue b/ruoyi-ui/src/views/market/whole/index.vue index e3c7150..b492bb7 100644 --- a/ruoyi-ui/src/views/market/whole/index.vue +++ b/ruoyi-ui/src/views/market/whole/index.vue @@ -557,6 +557,7 @@ export default { handleQuery() { this.queryParams.pageNum = 1; this.getList(); + this.storeStatistics(); }, /** 重置按钮操作 */ resetQuery() { diff --git a/ruoyi-ui/src/views/statistics/black/index.vue b/ruoyi-ui/src/views/statistics/black/index.vue index a8608ba..94bf497 100644 --- a/ruoyi-ui/src/views/statistics/black/index.vue +++ b/ruoyi-ui/src/views/statistics/black/index.vue @@ -95,7 +95,7 @@ - +