From 96a78109af4927dd08771b004076745ff481e770 Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Mon, 22 Nov 2021 11:39:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=B0=8F=E6=A1=94=E9=A2=9D?=
 =?UTF-8?q?=E5=A4=96=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evcs/dto/ChargeOrderInfoResponse.java     | 62 ++++++++++++--
 .../xhpc/evcs/dto/ChargeResultRequest.java    | 82 ++++++++++++++++++-
 2 files changed, 135 insertions(+), 9 deletions(-)

diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfoResponse.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfoResponse.java
index 42d1cc71..c1cebd9a 100644
--- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfoResponse.java
+++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeOrderInfoResponse.java
@@ -1,9 +1,9 @@
 package com.xhpc.evcs.dto;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import lombok.Getter;
-import lombok.Setter;
+import com.fasterxml.jackson.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * @Author HongYun on 2021/11/2
@@ -13,8 +13,6 @@ import lombok.Setter;
         "ConnectorID",
         "ConfirmResult"
 })
-@Setter
-@Getter
 public class ChargeOrderInfoResponse {
 
     @JsonProperty("StartChargeSeq")
@@ -25,4 +23,56 @@ public class ChargeOrderInfoResponse {
 
     @JsonProperty("ConfirmResult")
     private Integer confirmResult;
+
+    @JsonProperty("StartChargeSeq")
+    public String getStartChargeSeq() {
+
+        return startChargeSeq;
+    }
+
+    @JsonProperty("StartChargeSeq")
+    public void setStartChargeSeq(String startChargeSeq) {
+
+        this.startChargeSeq = startChargeSeq;
+    }
+
+    @JsonProperty("ConnectorID")
+    public String getConnectorID() {
+
+        return connectorID;
+    }
+
+    @JsonProperty("ConnectorID")
+    public void setConnectorID(String connectorID) {
+
+        this.connectorID = connectorID;
+    }
+
+    @JsonProperty("ConfirmResult")
+    public Integer getConfirmResult() {
+
+        return confirmResult;
+    }
+
+    @JsonProperty("ConfirmResult")
+    public void setConfirmResult(Integer confirmResult) {
+
+        this.confirmResult = confirmResult;
+    }
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+
+        this.additionalProperties.put(name, value);
+    }
+
 }
diff --git a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeResultRequest.java b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeResultRequest.java
index 49422635..8cf557af 100644
--- a/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeResultRequest.java
+++ b/evcs-modules/evcs-common/src/main/java/com/xhpc/evcs/dto/ChargeResultRequest.java
@@ -1,9 +1,10 @@
 package com.xhpc.evcs.dto;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.*;
+
+import java.util.HashMap;
+import java.util.Map;
 
-@lombok.Data
 @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE,
         setterVisibility = JsonAutoDetect.Visibility.NONE, creatorVisibility = JsonAutoDetect.Visibility.NONE)
 /**
@@ -22,4 +23,79 @@ public class ChargeResultRequest {
     @JsonProperty("FailReason")
     Integer failReason;
 
+    @JsonProperty("StartChargeSeq")
+    public String getStartChargeSeq() {
+
+        return startChargeSeq;
+    }
+
+    @JsonProperty("StartChargeSeq")
+    public void setStartChargeSeq(String startChargeSeq) {
+
+        this.startChargeSeq = startChargeSeq;
+    }
+
+    @JsonProperty("StartChargeSeqStat")
+    public Integer getStartChargeSeqStat() {
+
+        return startChargeSeqStat;
+    }
+
+    @JsonProperty("StartChargeSeqStat")
+    public void setStartChargeSeqStat(Integer startChargeSeqStat) {
+
+        this.startChargeSeqStat = startChargeSeqStat;
+    }
+
+    @JsonProperty("ConnectorID")
+    public String getConnectorID() {
+
+        return connectorID;
+    }
+
+    @JsonProperty("ConnectorID")
+    public void setConnectorID(String connectorID) {
+
+        this.connectorID = connectorID;
+    }
+
+    @JsonProperty("SuccStat")
+    public Integer getSuccStat() {
+
+        return succStat;
+    }
+
+    @JsonProperty("SuccStat")
+    public void setSuccStat(Integer succStat) {
+
+        this.succStat = succStat;
+    }
+
+    @JsonProperty("FailReason")
+    public Integer getFailReason() {
+
+        return failReason;
+    }
+
+    @JsonProperty("FailReason")
+    public void setFailReason(Integer failReason) {
+
+        this.failReason = failReason;
+    }
+
+    @JsonIgnore
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    @JsonAnyGetter
+    public Map<String, Object> getAdditionalProperties() {
+
+        return this.additionalProperties;
+    }
+
+    @JsonAnySetter
+    public void setAdditionalProperty(String name, Object value) {
+
+        this.additionalProperties.put(name, value);
+    }
+
 }