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:
ZZ 2021-12-07 16:13:59 +08:00
parent c2689f447c
commit 6507640b14
1 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java
View File

@ -45,7 +45,11 @@ public class QueryStartChargeController {
public CommonResponse queryStartCharge(@RequestBody CommonRequest<StartChargeRequest> commonRequest) throws Exception { public CommonResponse queryStartCharge(@RequestBody CommonRequest<StartChargeRequest> commonRequest) throws Exception {
CommonResponse resp = new CommonResponse(); CommonResponse resp = new CommonResponse();
resp.setRet(EvcsConst.RET_FAIL);
StartChargeResponse startChargeResponse = new StartChargeResponse(); StartChargeResponse startChargeResponse = new StartChargeResponse();
startChargeResponse.setFailReason(0);
startChargeResponse.setSuccStat(1);
startChargeResponse.setStartChargeSeqStat(4);
StartChargeRequest startChargeRequest = JSONUtil.readParams(commonRequest.getData(), StartChargeRequest.class); StartChargeRequest startChargeRequest = JSONUtil.readParams(commonRequest.getData(), StartChargeRequest.class);
String startChargeSeq = startChargeRequest.getStartChargeSeq(); String startChargeSeq = startChargeRequest.getStartChargeSeq();
String connectorId = startChargeRequest.getConnectorId(); String connectorId = startChargeRequest.getConnectorId();
@ -53,6 +57,8 @@ public class QueryStartChargeController {
String terminalStatus = (String) cacheGun.get("vehicleGunStatus"); String terminalStatus = (String) cacheGun.get("vehicleGunStatus");
String status = (String) cacheGun.get("status"); String status = (String) cacheGun.get("status");
EtOrderMapping etOrderMapping = new EtOrderMapping(); EtOrderMapping etOrderMapping = new EtOrderMapping();
Date now = DateUtils.getNowDate();
etOrderMapping.setCreateTime(now);
etOrderMapping.setEvcsOrderNo(startChargeSeq); etOrderMapping.setEvcsOrderNo(startChargeSeq);
if (!"空闲".equals(status)) { if (!"空闲".equals(status)) {
resp.setMsg("终端状态异常:[".concat(status == null ? "未注册" : status).concat("]")); resp.setMsg("终端状态异常:[".concat(status == null ? "未注册" : status).concat("]"));
@ -69,6 +75,7 @@ public class QueryStartChargeController {
startChargeRequest.getChargingAmt(), plateNum, -1, connectorId); startChargeRequest.getChargingAmt(), plateNum, -1, connectorId);
startChargeResponse.setStartChargeSeq(startChargeSeq); startChargeResponse.setStartChargeSeq(startChargeSeq);
startChargeResponse.setConnectorID(connectorId); startChargeResponse.setConnectorID(connectorId);
resp.setMsg(res.getMsg());
if (res.getCode() != 200) { if (res.getCode() != 200) {
if (res.getCode() != 500) { if (res.getCode() != 500) {
startChargeResponse.setFailReason(res.getCode()); startChargeResponse.setFailReason(res.getCode());
@ -77,29 +84,29 @@ public class QueryStartChargeController {
} }
startChargeResponse.setSuccStat(1); startChargeResponse.setSuccStat(1);
startChargeResponse.setStartChargeSeqStat(4); startChargeResponse.setStartChargeSeqStat(4);
emptyHorder(startChargeSeq, connectorId, etOrderMapping);
} else { } else {
Map<String, Object> etOrderData = (Map<String, Object>) res.getData();
if (etOrderData != null) {
resp.setRet(EvcsConst.RET_SUCC);
startChargeResponse.setStartChargeSeqStat(1); startChargeResponse.setStartChargeSeqStat(1);
startChargeResponse.setSuccStat(0); startChargeResponse.setSuccStat(0);
startChargeResponse.setFailReason(0); startChargeResponse.setFailReason(0);
}
Map<String, Object> etOrderData = (Map<String, Object>) res.getData();
etOrderMapping.setXhOrderNo(String.valueOf(etOrderData.get("orderNo")));
Map<String, Object> pushOrder = new HashMap<>(); Map<String, Object> pushOrder = new HashMap<>();
pushOrder.put("startChargeSeqStat", 1); pushOrder.put("startChargeSeqStat", 1);
String orderNo = String.valueOf(etOrderData.get("orderNo"));
pushOrder.put("internetSerialNumber", startChargeRequest.getStartChargeSeq()); pushOrder.put("internetSerialNumber", startChargeRequest.getStartChargeSeq());
pushOrder.put("connectorID", connectorId); pushOrder.put("connectorID", connectorId);
pushOrder.put("startTime", etOrderData.get("startTime"));
pushOrder.put("startChargeNotificationStat", 0); pushOrder.put("startChargeNotificationStat", 0);
pushOrder.put("chargeOrderInfoNotificationStat", 0); pushOrder.put("chargeOrderInfoNotificationStat", 0);
pushOrder.put("operatorId3rdpty", startChargeSeq.substring(0, 9)); pushOrder.put("operatorId3rdpty", startChargeSeq.substring(0, 9));
pushOrder.put("startTime", etOrderData.get("startTime"));
String orderNo = (String) etOrderData.get("orderNo");
etOrderMapping.setXhOrderNo(orderNo);
REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder); REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder);
if (res.getCode() != 200) {
resp.setRet(EvcsConst.RET_FAIL);
} else { } else {
resp.setRet(EvcsConst.RET_SUCC); emptyHorder(startChargeSeq, connectorId, etOrderMapping);
}
} }
resp.setMsg(res.getMsg());
} }
etOrderMappingRepo.save(etOrderMapping); etOrderMappingRepo.save(etOrderMapping);
resp.setData(JSONUtil.toJSONString(startChargeResponse)); resp.setData(JSONUtil.toJSONString(startChargeResponse));