wangshuai
/
youshi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1；导出历史默认时间 

2；打印
This commit is contained in:
wangshuai 2024-08-03 10:27:53 +08:00
parent 0cce138a45
commit 5f7ade0f9c
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java
View File

@ -305,6 +305,11 @@ public class BusStoreInfoController extends BaseController {
if (!"admin".equals(user.getUsername())) { if (!"admin".equals(user.getUsername())) {
busStoreInfo.setBindUser(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<RespBusStoreHistoryInfo> listNew = busStoreInfoService.storeHistoryStatisticsExport(busStoreInfo); List<RespBusStoreHistoryInfo> listNew = busStoreInfoService.storeHistoryStatisticsExport(busStoreInfo);
ExcelUtil<RespBusStoreHistoryInfo> util = new ExcelUtil<>(RespBusStoreHistoryInfo.class); ExcelUtil<RespBusStoreHistoryInfo> util = new ExcelUtil<>(RespBusStoreHistoryInfo.class);
util.exportExcel(response, listNew, "店铺单日统计信息"); util.exportExcel(response, listNew, "店铺单日统计信息");

6
ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java
View File

@ -481,7 +481,7 @@ public class MeituanServiceImpl implements IMeituanService {
list.add(orderInfo); list.add(orderInfo);
}catch (Exception e){ }catch (Exception e){
log.error("================解析订单错误============="); log.error(wmPoiId+"================解析订单错误=============");
} }
} }
if (list.size() > 0) { if (list.size() > 0) {
@ -496,7 +496,7 @@ public class MeituanServiceImpl implements IMeituanService {
} else if ("1001".equals(jo.getString("code"))) { } else if ("1001".equals(jo.getString("code"))) {
storeInfo1.setGrantStatus("2"); storeInfo1.setGrantStatus("2");
busStoreInfoMapper.updateBusStoreInfo(storeInfo1); busStoreInfoMapper.updateBusStoreInfo(storeInfo1);
log.error("掉线"); log.error("掉线"+wmPoiId);
} }
} }
} else if ("1001".equals(code)) { } else if ("1001".equals(code)) {
@ -504,7 +504,7 @@ public class MeituanServiceImpl implements IMeituanService {
busStoreInfoMapper.updateBusStoreInfo(storeInfo1); busStoreInfoMapper.updateBusStoreInfo(storeInfo1);
} }
}catch (Exception e){ }catch (Exception e){
log.error("================拉取订单出错：==============="+e.getMessage()); log.error(wmPoiId+"================拉取订单出错：==============="+e.getMessage());
// return orderInfo(wmPoiId, date, cookie); // return orderInfo(wmPoiId, date, cookie);
} }
} }

2
ruoyi-system/src/main/resources/mapper/business/BusStoreInfoMapper.xml
View File

@ -223,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
END selfDeliveryStatus END selfDeliveryStatus
FROM FROM
bus_store_info s 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 LEFT JOIN bus_store_config_info sc ON s.store_code = sc.store_code
where s.self_delivery_status != '3' where s.self_delivery_status != '3'
<if test="selfDeliveryStatus != null and selfDeliveryStatus != ''"> and s.self_delivery_status = #{selfDeliveryStatus}</if> <if test="selfDeliveryStatus != null and selfDeliveryStatus != ''"> and s.self_delivery_status = #{selfDeliveryStatus}</if>

2
ruoyi-ui/src/views/statistics/shop/index.vue
View File

@ -328,7 +328,7 @@ export default {
saleBindId: undefined, saleBindId: undefined,
grantStatus: undefined, grantStatus: undefined,
returnVisitStatus: undefined, returnVisitStatus: undefined,
storeBelong: undefined storeBelong: new Date(new Date() - (1000 * 60 * 60 * 24))
}, },
saleList: [], saleList: [],
agentList:[], agentList:[],