From 2d6f6874c853c503de4be393aae14d736f8a0535 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Tue, 14 Sep 2021 11:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=A2=9E=E5=8A=A0=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=A1=A9=E7=9A=84=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/common/domain/XhpcTerminal.java | 15 +++++++++++++++
 .../resources/mapper/XhpcChargeOrderMapper.xml    | 10 ++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
index 4cb493e5..a6632b3e 100644
--- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
+++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java
@@ -47,6 +47,11 @@ public class XhpcTerminal extends BaseEntity {
 
     private Long operatorId;
 
+    /**
+     * 电桩统计数量
+     */
+    private Integer number;
+
     public Long getOperatorId() {
         return operatorId;
     }
@@ -170,4 +175,14 @@ public class XhpcTerminal extends BaseEntity {
         this.rateModelId = rateModelId;
     }
 
+    public Integer getNumber() {
+
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+
+        this.number = number;
+    }
+
 }
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
index 7e8aed79..709445f0 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
@@ -397,7 +397,10 @@
                 update_by,
             </if>
             <if test="null != remark ">
-                remark
+                remark,
+            </if>
+            <if test="null != orderData ">
+                order_data
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -450,7 +453,10 @@
                 #{updateBy},
             </if>
             <if test="null != remark ">
-                #{remark}
+                #{remark},
+            </if>
+            <if test="null != orderData ">
+                #{orderData}
             </if>
         </trim>
     </insert>