yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改实时订单搜索

Browse Source
This commit is contained in:
yuyang 2021-11-24 17:22:49 +08:00
parent e98550539d
commit 682de75a23
2 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java
View File

@ -412,11 +412,12 @@ public class XhpcHistoryOrderController extends BaseController {
logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>");
logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>");
logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>"); logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务>>>>>>>>>>>>>>>>>>>>>");
try{
//小时统计 //小时统计
List<XhpcChargeHistoryOrder> list = xhpcHistoryOrderService.getStatistisList(500,0); List<XhpcChargeHistoryOrder> list = xhpcHistoryOrderService.getStatistisList(500,0);
if(list !=null && list.size()>0){ if(list !=null && list.size()>0){
for (XhpcChargeHistoryOrder xhpc:list) { for (XhpcChargeHistoryOrder xhpc:list) {
try{
//开始时间、结束时间、模型id、状态、用户id、运营商、订单id、场站id、终端id、历史订单id、时间 //开始时间、结束时间、模型id、状态、用户id、运营商、订单id、场站id、终端id、历史订单id、时间
Date startTime = xhpc.getStartTime(); Date startTime = xhpc.getStartTime();
Date endTime = xhpc.getEndTime(); Date endTime = xhpc.getEndTime();
@ -466,22 +467,35 @@ public class XhpcHistoryOrderController extends BaseController {
if(xhpc.getSource()==1){ if(xhpc.getSource()==1){
xhpcSt.setInternetUserId(xhpc.getUserId()); xhpcSt.setInternetUserId(xhpc.getUserId());
} }
List<Map<String, Object>> reatTimeList = xhpcHistoryOrderService.getReatTimeList(DateUtil.formatTime(startTime), DateUtil.formatTime(endTime), rateModelId);
Map<String, Object> map = reatTimeList.get(0); //时间没有跨天
xhpcSt.setElecPriceEvcs(new BigDecimal(map.get("powerFee").toString())); // DateTime parse = DateUtil.parse(DateUtil.format(startTime, "yyyy-MM-dd"), "yyyy-MM-dd");
xhpcSt.setServicePriceEvcs(new BigDecimal(map.get("serviceFee").toString())); // DateTime parse1 = DateUtil.parse(DateUtil.format(endTime, "yyyy-MM-dd"), "yyyy-MM-dd");
// long betweenDay = DateUtil.between(parse,parse1, DateUnit.DAY);
// Map<String, Object> map = new HashMap<>();
// if(betweenDay==0){
// List<Map<String, Object>> reatTimeList = xhpcHistoryOrderService.getReatTimeList(DateUtil.formatTime(startTime), DateUtil.formatTime(endTime), rateModelId);
// map = reatTimeList.get(0);
// }else{
// //明天
// DateTime tomorrow = DateUtil.offsetDay(startTime,1);
// Date startTime3 =DateUtil.beginOfDay(tomorrow);
// List<Map<String, Object>> reatTimeList = xhpcHistoryOrderService.getReatTimeList(DateUtil.formatTime(startTime3), DateUtil.formatTime(endTime), rateModelId);
// map = reatTimeList.get(0);
// }
// xhpcSt.setElecPriceEvcs(new BigDecimal(map.get("powerFee").toString()));
// xhpcSt.setServicePriceEvcs(new BigDecimal(map.get("serviceFee").toString()));
xhpcSt.setStartTimeEvcs(DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss")); xhpcSt.setStartTimeEvcs(DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"));
xhpcSt.setEndTimeEvcs(DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss")); xhpcSt.setEndTimeEvcs(DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"));
xhpcSt.setCreateTime(xhpc.getEndTime()); xhpcSt.setCreateTime(xhpc.getEndTime());
xhpcStatisticsService.addStatisticsTime(xhpcSt); xhpcStatisticsService.addStatisticsTime(xhpcSt);
//修改历史订单表状态 //修改历史订单表状态
xhpcHistoryOrderService.updateXhpcHistoryOrder(xhpc.getHistoryOrderId(),1); xhpcHistoryOrderService.updateXhpcHistoryOrder(xhpc.getHistoryOrderId(),1);
}
}
}catch (Exception e){ }catch (Exception e){
logger.info(">>>>>>>>>>>>>>>>>>>>>>>小时统计定时任务异常>>>>>>>>>>>>>>>>>>>>>"+xhpc.getHistoryOrderId());
}
}
} }
} }

2
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
View File

@ -423,7 +423,7 @@
and co.serial_number like concat('%', #{transactionNumber}, '%') and co.serial_number like concat('%', #{transactionNumber}, '%')
</if> </if>
<if test="chargingStationName !=null and chargingStationName !=''"> <if test="chargingStationName !=null and chargingStationName !=''">
and co.serial_number like concat('%', #{chargingStationName}, '%') and ct.name like concat('%', #{chargingStationName}, '%')
</if> </if>
<if test="terminalName !=null and terminalName !=''"> <if test="terminalName !=null and terminalName !=''">
and ter.name like concat('%', #{terminalName}, '%') and ter.name like concat('%', #{terminalName}, '%')