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 50da6e4..1604a28 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 @@ -163,6 +163,56 @@ public class BusStoreInfoController extends BaseController { return rspData; } + @ApiOperation("查询店铺信息列表") + @GetMapping("/listHistory") + public TableDataInfo listHistory(ReqBusStoreInfo reqBusStoreInfo) {//new RespBusStoreInfo(busStoreInfo1) + startPage(); + BusStoreInfo busStoreInfo = new BusStoreInfo(); + BeanUtils.copyProperties(reqBusStoreInfo, busStoreInfo); + LoginUser user = SecurityUtils.getLoginUser(); + if (!"admin".equals(user.getUsername())) { + busStoreInfo.setBindUser(user.getUsername()); + } + List list = busStoreInfoService.selectBusStoreInfoList(busStoreInfo); + TableDataInfo rspData = getDataTable(list); + 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()); + } + return info; + }) + .collect(Collectors.toList()); +// tableList.forEach(System.out::println); + rspData.setRows(tableList); + return rspData; + } + @ApiOperation("查询店铺信息列表") // @PreAuthorize("@ss.hasPermi('business:store:list')") @GetMapping("/getMtUrl") diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 16ca311..238e45b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -137,7 +137,7 @@ public class SecurityConfig .antMatchers(HttpMethod.POST,"/mt/cookies").permitAll() .antMatchers("/test/**").permitAll() .antMatchers("/eleme/message_receive").permitAll() - .antMatchers(HttpMethod.GET,"/mt/getReturnInfo").permitAll() +// .antMatchers(HttpMethod.GET,"/mt/getReturnInfo").permitAll() .antMatchers("/common/**").permitAll() // .antMatchers("/mt/**").permitAll() // .antMatchers("/ai/**").permitAll() 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 172f286..83dc170 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 @@ -718,7 +718,7 @@ public class MeituanServiceImpl implements IMeituanService { url = appendParams(url, params); HttpGet request = new HttpGet(url); request.setHeader("Cookie",cookie); - request.setHeader("Host","waimaieapp.meituan.com"); + request.setHeader("Accept-Encoding","gzip, deflate, br"); request.setHeader("User-Agent","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36"); String result = null; try {