From b20e7ae47061ae7e2fb57f1906aff9e9038bcfed Mon Sep 17 00:00:00 2001 From: yuyang Date: Thu, 11 Aug 2022 09:23:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=A4=B1=E8=B4=A5=E7=9A=84=E5=8E=9F=E5=9B=A0=EF=BC=8C?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=E7=9A=84=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/order/api/XhpcPileOrderController.java | 3 ++- .../com/xhpc/order/mapper/XhpcChargeOrderMapper.java | 2 +- .../order/service/impl/XhpcChargeOrderServiceImpl.java | 10 +++++----- .../main/resources/mapper/XhpcChargeOrderMapper.xml | 6 +++++- .../main/resources/mapper/XhpcHistoryOrderMapper.xml | 4 ++-- 5 files changed, 15 insertions(+), 10 deletions(-) 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 3be7513b..fb36b12a 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 @@ -156,6 +156,7 @@ public class XhpcPileOrderController extends BaseController { }else if(status==3 || status==4){ //订单定位异常,修改充电订单状态 if(status==3) { + xhpcChargeOrder.setErroRemark(remark); xhpcChargeOrder.setStatus(2); xhpcChargeOrder.setUpdateTime(new Date()); //获取实时订单 @@ -735,7 +736,7 @@ public class XhpcPileOrderController extends BaseController { xhpcChargeOrder.setDelFlag(1); xhpcChargeOrder.setEndTime(date); } - xhpcChargeOrder.setErroRemark(remark); + //xhpcChargeOrder.setErroRemark(remark); Long userId = xhpcChargeOrder.getUserId(); if (type == 1) { diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java index 30f9c007..2aba4810 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java @@ -205,7 +205,7 @@ public interface XhpcChargeOrderMapper { /** * 标记异常大于创建4小时，标记为异常 */ - void updateStatus(@Param("status")Integer status,@Param("chargeOrderId")Long chargeOrderId); + void updateStatus(@Param("status")Integer status,@Param("chargeOrderId")Long chargeOrderId,@Param("erroRemark")String erroRemark); /** * 4小时订单未结算的订单 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 e580bdc7..f15e1698 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 @@ -666,17 +666,17 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar Long chargeOrderId = xhpcChargeOrder.getChargeOrderId(); if(UserTypeUtil.INTERNET_TYPE.equals(xhpcChargeOrder.getSource())){ //标记异常 - xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的第三方订单，系统自动修改为异常订单"); }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); + xhpcChargeOrderMapper.updateStatus(-1,chargeOrderId,null); }else{ //标记异常 - xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的C端用户订单，系统自动修改为异常订单"); } }else{ @@ -684,10 +684,10 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar long l = System.currentTimeMillis();//秒 Date date = DateUtil.parse(cacheRealtimeData.getCreateTime(), "yyyy-MM-dd HH:mm:ss"); if(l-date.getTime()>360000){ - xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的C端用户订单，系统自动修改为异常订单"); } }else{ - xhpcChargeOrderMapper.updateStatus(2,chargeOrderId); + xhpcChargeOrderMapper.updateStatus(2,chargeOrderId,"大于4小时没有结算的C端用户订单，系统自动修改为异常订单"); } } } 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 179de833..c5d0396e 100644 --- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml +++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml @@ -702,7 +702,11 @@ - update xhpc_charge_order set status=#{status} where status=0 and charge_order_id = #{chargeOrderId} + update xhpc_charge_order set status=#{status} + + and erro_remark=#{erroRemark} + + where status=0 and charge_order_id = #{chargeOrderId}