diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java index ddfe3ca8..7ecc7506 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/api/QueryStartChargeController.java @@ -59,19 +59,22 @@ public class QueryStartChargeController { startChargeResponse.setFailReason(0); startChargeResponse.setStartChargeSeqStat(5); } else { + Map etOrderData = (Map) res.getData(); EtOrderMapping etOrderMapping = new EtOrderMapping(); etOrderMapping.setEvcsOrderNo(startChargeSeq); -// etOrderMapping.setXhOrderNo(xhOrderNo);//todo 鸿运 + etOrderMapping.setXhOrderNo(String.valueOf(etOrderData.get("orderNo"))); etOrderMappingRepo.save(etOrderMapping); startChargeResponse.setStartChargeSeqStat(2); startChargeResponse.setSuccStat(0); startChargeResponse.setFailReason(0); //insert a gunStatusData to redis Map pushOrder = new HashMap<>(); - //0 means charging. - pushOrder.put("status", 0); + //1 means charging. + pushOrder.put("startChargeSeqStat", 1); String orderNo = (String) res.getData(); pushOrder.put("internetSerialNumber", startChargeRequest.getStartChargeSeq()); + pushOrder.put("connectorID", connectorID); + pushOrder.put("startTime", etOrderData.get("startTime")); REDIS.setCacheMap("pushOrder:".concat(orderNo), pushOrder); } resp.setRet(String.valueOf(res.getCode())); 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 f24b6c30..6f3dc331 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 @@ -21,10 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.PostConstruct; import java.math.BigDecimal; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -454,11 +451,15 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService { r.setCode(500); return r; } + String startTime = DateUtil.format(date, "yyyy-MM-dd HH: mm: ss"); int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status); + Map data = new HashMap<>(); System.out.println(res); if (res != 0) { r.setCode(200); - r.setData(orderNo); + data.put("orderNo", orderNo); + data.put("startTime", startTime); + r.setData(data); } else { r.setCode(500); }