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 c2be83d4..74dbf094 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 @@ -285,18 +285,19 @@ public class XhpcPileOrderController extends BaseController { logger.info("无效订单号>>>>>orderNo:" + orderNo); return R.fail(500,"无效订单号:"+orderNo); } + if("00000000000000000000000000000000".equals(orderNo)){ + logger.info("无效订单号>>>>>orderNo:" + orderNo); + return R.ok(); + } //获取充电订单 XhpcChargeOrder xhpcChargeOrder = xhpcChargeOrderService.getSerialNumberMessage(orderNo); Map pushOrder = redisService.getCacheMap("pushOrder:"+orderNo); //判断结算订单是否有回复启动成功 boolean judge =false; if(pushOrder !=null){ - if(pushOrder.get("internetSerialNumber") ==null){ - xhpcChargeOrder.setStatus(2); - xhpcChargeOrder.setUpdateTime(new Date()); - xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); - return R.ok(); - }else if("2".equals(pushOrder.get("internetSerialNumber").toString())){ + if(pushOrder.get("startChargeSeqStat") ==null){ + judge =true; + }else if("2".equals(pushOrder.get("startChargeSeqStat").toString())){ //正常结算 }else{ judge=true; @@ -305,10 +306,10 @@ public class XhpcPileOrderController extends BaseController { judge =true; } if (judge) { - xhpcChargeOrder.setStatus(3); + xhpcChargeOrder.setStatus(2); xhpcChargeOrder.setUpdateTime(new Date()); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); - xhpcRealTimeOrderService.addZeroHistoryOrder(xhpcChargeOrder); + //xhpcRealTimeOrderService.addZeroHistoryOrder(xhpcChargeOrder); logger.info("订单无实时数据>>>>>orderNo:" + orderNo); return R.ok(); }