diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java index 8fca2ad2..e28c5363 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/CDChargeOrderInfo4BonusReq.java @@ -104,7 +104,7 @@ public class CDChargeOrderInfo4BonusReq { this.equipmentId = xhpcHistoryOrder.getSerialNumber().substring(0, 14); this.connectorPower = xhpcHistoryOrder.getConnectorPowerEvcs(); Date starttime = xhpcHistoryOrder.getStartTime(); - Date endtime = xhpcHistoryOrder.getCreateTime(); + Date endtime = xhpcHistoryOrder.getEndTime(); int cl = 0; if (starttime != null && endtime != null) { cl = Math.toIntExact((endtime.getTime() - starttime.getTime()) / 1000); diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java index 92cece01..32857d95 100644 --- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java +++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/QueryStopChargeRequest.java @@ -11,9 +11,9 @@ import lombok.Setter; setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE) public class QueryStopChargeRequest { - @JsonProperty("startChargeSeq") + @JsonProperty("StartChargeSeq") String startChargeSeq; - @JsonProperty("connectorId") + @JsonProperty("ConnectorID") String connectorId; } diff --git a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java index 5510631c..b1a7d0aa 100644 --- a/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java +++ b/evcs-modules/evcs-core/src/main/java/com/xhpc/evcs/config/EvcsFilter.java @@ -230,7 +230,7 @@ public class EvcsFilter extends OncePerRequestFilter { sigSecret); commonRequest.setSig(sig); final String jsonString = JSONUtil.toJSONString(commonRequest); - log.debug("enc to out:{} ", jsonString); +// log.debug("enc to out:{} ", jsonString); return jsonString; } @@ -266,7 +266,7 @@ public class EvcsFilter extends OncePerRequestFilter { } String sig = HMAC.hmacDigest(rootNode.path("Ret").asText() + rootNode.path("Msg").asText() + data, sigSecret); ((ObjectNode) rootNode).put("Sig", sig); - log.debug("enc to out: " + rootNode); +// log.debug("enc to out: " + rootNode); return rootNode; }