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 68a77af..c4d52b9 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 @@ -305,6 +305,11 @@ public class BusStoreInfoController extends BaseController { if (!"admin".equals(user.getUsername())) { busStoreInfo.setBindUser(user.getUsername()); } + if(StringUtils.isEmpty(busStoreInfo.getStoreBelong())){ + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + LocalDateTime localDateTime = LocalDateTime.now().minusDays(1); + busStoreInfo.setStoreBelong(localDateTime.format(dateTimeFormatter)); + } 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/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index 09089db..a90f657 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 @@ -481,7 +481,7 @@ public class MeituanServiceImpl implements IMeituanService { list.add(orderInfo); }catch (Exception e){ - log.error("================解析订单错误============="); + log.error(wmPoiId+"================解析订单错误============="); } } if (list.size() > 0) { @@ -496,7 +496,7 @@ public class MeituanServiceImpl implements IMeituanService { } else if ("1001".equals(jo.getString("code"))) { storeInfo1.setGrantStatus("2"); busStoreInfoMapper.updateBusStoreInfo(storeInfo1); - log.error("掉线"); + log.error("掉线"+wmPoiId); } } } else if ("1001".equals(code)) { @@ -504,7 +504,7 @@ public class MeituanServiceImpl implements IMeituanService { busStoreInfoMapper.updateBusStoreInfo(storeInfo1); } }catch (Exception e){ - log.error("================拉取订单出错:==============="+e.getMessage()); + log.error(wmPoiId+"================拉取订单出错:==============="+e.getMessage()); // return orderInfo(wmPoiId, date, cookie); } } diff --git a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml index 14542be..ee646a5 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml @@ -223,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" END selfDeliveryStatus FROM bus_store_info s - LEFT JOIN bus_store_day_history_info sd ON s.id = sd.store_id and DATE_FORMAT(sd.create_time,'%Y-%m-%d') = #{storeBelong} + LEFT JOIN bus_store_day_info sd ON s.id = sd.store_id LEFT JOIN bus_store_config_info sc ON s.store_code = sc.store_code where s.self_delivery_status != '3' and s.self_delivery_status = #{selfDeliveryStatus} diff --git a/ruoyi-ui/src/views/statistics/shop/index.vue b/ruoyi-ui/src/views/statistics/shop/index.vue index 44efb19..de31b6e 100644 --- a/ruoyi-ui/src/views/statistics/shop/index.vue +++ b/ruoyi-ui/src/views/statistics/shop/index.vue @@ -328,7 +328,7 @@ export default { saleBindId: undefined, grantStatus: undefined, returnVisitStatus: undefined, - storeBelong: undefined + storeBelong: new Date(new Date() - (1000 * 60 * 60 * 24)) }, saleList: [], agentList:[],