parent
0cce138a45
commit
5f7ade0f9c
|
@ -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, "店铺单日统计信息");
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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:[],
|
||||||
|
|
Loading…
Reference in New Issue