From 604e01995565e46ed705d31d53f682c0a550f230 Mon Sep 17 00:00:00 2001 From: yuyang Date: Tue, 18 Jan 2022 16:58:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E7=94=B5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=8F=A0=E5=8A=A0=E5=A4=87=E6=B3=A8=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=95=99=E8=A8=80=E6=9D=BF=E4=BF=A1=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/XhpcInvoiceServiceImpl.java | 2 +- .../order/api/XhpcPileOrderController.java | 2 +- .../XhpcHistoryOrderController.java | 24 +++++++++++++++++++ .../impl/XhpcChargeOrderServiceImpl.java | 23 +++++++++++------- .../impl/XhpcRealTimeOrderServiceImpl.java | 12 ++++++++-- .../mapper/XhpcChargeOrderMapper.xml | 2 +- .../mapper/XhpcHistoryOrderMapper.xml | 2 ++ .../service/impl/XhpcAppUserServiceImpl.java | 14 +++++++++-- 8 files changed, 65 insertions(+), 16 deletions(-) diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index 2528d3e7..6d345f3e 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -260,7 +260,7 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { public InvoicedOrderResponse findUserHistoryOrders(InvoicedOrdersRequest invoicedOrdersRequest) { //自动生成当前时间 - if (invoicedOrdersRequest.getCurrentTime() == null) { + if (invoicedOrdersRequest.getCurrentTime() == null || "".equals(invoicedOrdersRequest.getCurrentTime())) { Date currentDate = new Date(); String strTime = DateUtils.parseDateToStr(currentDate); invoicedOrdersRequest.setCurrentTime(strTime); diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java index 3e50d7fd..ad2cd3e3 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java @@ -383,7 +383,7 @@ public class XhpcPileOrderController extends BaseController { //订单异常 xhpcChargeOrder.setStatus(2); //异常原因 - xhpcChargeOrder.setErroRemark("桩异常：" + stopReason + ">>>>用户id:" + userId + "为空"); + xhpcChargeOrder.setErroRemark("".equals(xhpcChargeOrder.getErroRemark())?"桩异常：" + stopReason + ">>>>用户id:" + userId + "为空":xhpcChargeOrder.getErroRemark()+"桩异常：" + stopReason + ">>>>用户id:" + userId + "为空"); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); R.ok(); } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java index 75aa172f..fc8b02aa 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/controller/XhpcHistoryOrderController.java @@ -888,6 +888,30 @@ public class XhpcHistoryOrderController extends BaseController { } } + @GetMapping("/getManualAudit") + public void getManualAudit(Long chargeOrderId){ + //获取异常的订单 24小时之外的异常订单 + XhpcChargeOrder xhpcChargeOrder = chargeOrderService.getChargingOrderId(chargeOrderId); + if(xhpcChargeOrder !=null){ + Integer source = xhpcChargeOrder.getSource(); + String tenantId = xhpcChargeOrder.getTenantId(); + xhpcChargeOrder.getChargeOrderId(); + if(!UserTypeUtil.INTERNET_TYPE.equals(source)){ + R user = userTypeService.getUser(null, xhpcChargeOrder.getUserId(), source, null, tenantId); + if(user !=null && user.getData() !=null){ + Map userMessage = (Map)user.getData(); + if (userMessage != null && userMessage.get("balance") != null) { + xhpcHistoryOrderService.addXhpcChargeOrder(userMessage,xhpcChargeOrder.getSerialNumber(),2); + } + } + }else{ + xhpcHistoryOrderService.addXhpcChargeOrder(null,xhpcChargeOrder.getSerialNumber(),2); + } + } + } + + + /** * 标记异常大于创建4小时，标记为异常 * @param diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index b83c85ce..9f5a9567 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -600,19 +600,24 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar List list = xhpcChargeOrderMapper.getFourTimsStatus(); if(list !=null && list.size()>0){ for (XhpcChargeOrder xhpcChargeOrder:list) { - CacheRealtimeData cacheRealtimeData = redisService.getCacheObject("order:" + xhpcChargeOrder.getSerialNumber() + ".lord"); Long chargeOrderId = xhpcChargeOrder.getChargeOrderId(); - if(cacheRealtimeData ==null){ - int count = xhpcChargeOrderMapper.getSerialNumberLike(xhpcChargeOrder.getSerialNumber().substring(0, 16), chargeOrderId); - if(count>0){ - //有充电改为 由充电中变为启动充电中 - xhpcChargeOrderMapper.updateStatus(-1,chargeOrderId); + if(UserTypeUtil.INTERNET_TYPE.equals(xhpcChargeOrder.getSource())){ + //标记异常 + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + }else{ + CacheRealtimeData cacheRealtimeData = redisService.getCacheObject("order:" + xhpcChargeOrder.getSerialNumber() + ".lord"); + if(cacheRealtimeData ==null){ + int count = xhpcChargeOrderMapper.getSerialNumberLike(xhpcChargeOrder.getSerialNumber().substring(0, 16), chargeOrderId); + if(count>0){ + //有充电改为 由充电中变为启动充电中 + xhpcChargeOrderMapper.updateStatus(-1,chargeOrderId); + }else{ + //标记异常 + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + } }else{ - //标记异常 xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); } - }else{ - xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); } } } diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java index 08114514..680219a6 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java @@ -160,6 +160,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe //获取该订单最后一条实时数据 Map cacheMap = redisService.getCacheMap("order:" + chargeOrder.getSerialNumber()); List list = (List) cacheMap.get("realtimeDataList"); + CacheRealtimeData startData =new CacheRealtimeData(); CacheRealtimeData endData =new CacheRealtimeData(); @@ -175,7 +176,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe Long rateModelId = chargeOrder.getRateModelId(); - if(endData !=null && endData.getAmountCharged() !=null){ + if(endData !=null && endData.getAmountCharged() !=null && startData.getChargingTime()>0){ message.put("soc",endData.getSoc()); //最后一祯时间 @@ -220,6 +221,12 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe chargeOrder.setChargingTime(endRealTimeOrder.getChargingTime()); message.put("chargingTime",endRealTimeOrder.getChargingTime()); + if(chargeOrder.getStartTime().equals(chargeOrder.getEndTime())){ + message.put("powerPriceTotal",0); + message.put("servicePriceTotal",0); + return AjaxResult.success(message); + } + chargeOrder.setStartTime(startTime); chargeOrder.setEndTime(endTime); chargeOrder.setStartSoc(startRealTimeOrder.getSoc()); @@ -233,6 +240,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe chargeOrder.setChargingDegree(chargingDegree); chargeOrder.setType(0); chargeOrder.setAmountCharged(endRealTimeOrder.getAmountCharged()); + } Date startTime2 = chargeOrder.getStartTime(); @@ -307,7 +315,7 @@ public class XhpcRealTimeOrderServiceImpl extends BaseService implements IXhpcRe //订单异常 xhpcChargeOrder.setStatus(2); //异常原因 - xhpcChargeOrder.setErroRemark("用户id:" + userId + "为空"); + xhpcChargeOrder.setErroRemark("".equals(xhpcChargeOrder.getErroRemark())?"用户id:" + userId + "为空":xhpcChargeOrder.getErroRemark()+"用户id:" + userId + "为空"); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); return AjaxResult.error("用户id:" + userId + "为空"); } diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml index 1e7e293f..64ece5ca 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -644,7 +644,7 @@ from xhpc_terminal as xt left join xhpc_charging_pile as xcp on xcp.serial_number = substring(#{serialNumber}, 1, 14) left join xhpc_charging_station as cs on xt.charging_station_id = cs.charging_station_id - where xt.serial_number = #{serialNumber} + where xt.serial_number = #{serialNumber} and xt.del_falg = 0