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 2022-04-06 17:59:46 +08:00
parent 3f390cd6b9
commit fc2143dc57
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

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