From 1f581be355650b2bda34546b6f435c85d8dcae27 Mon Sep 17 00:00:00 2001
From: yuyang <2265829957@qq.com>
Date: Mon, 9 Aug 2021 18:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/order/domain/XhpcHistoryOrder.java  | 12 +++++++-----
 .../resources/mapper/XhpcHistoryOrderMapper.xml  | 16 ++++++++--------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
index dfd66a50..dae0d4b2 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/domain/XhpcHistoryOrder.java
@@ -25,7 +25,7 @@ public class XhpcHistoryOrder extends BaseEntity {
     /**
      * 充电订单id
      */
-    private Long chargingOrderId;
+    private Long chargeOrderId;
 
     /**
      * 用户id
@@ -153,12 +153,14 @@ public class XhpcHistoryOrder extends BaseEntity {
         this.chargingStationId = chargingStationId;
     }
 
-    public Long getChargingOrderId() {
-        return chargingOrderId;
+    public Long getChargeOrderId() {
+
+        return chargeOrderId;
     }
 
-    public void setChargingOrderId(Long chargingOrderId) {
-        this.chargingOrderId = chargingOrderId;
+    public void setChargeOrderId(Long chargeOrderId) {
+
+        this.chargeOrderId = chargeOrderId;
     }
 
     public Long getUserId() {
diff --git a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index cd03a6ee..32209d98 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -7,7 +7,7 @@
     <resultMap type="com.xhpc.order.domain.XhpcHistoryOrder" id="XhpcHistoryOrderResult">
         <result column="history_order_id" property="historyOrderId"/>
         <result column="charging_station_id" property="chargingStationId"/>
-        <result column="charging_order_id" property="chargingOrderId"/>
+        <result column="charging_order_id" property="chargeOrderId"/>
         <result column="user_id" property="userId"/>
         <result column="terminal_id" property="terminalId"/>
         <result column="serial_number" property="serialNumber"/>
@@ -43,8 +43,8 @@
             <if test="null != chargingStationId and '' != chargingStationId">
                 charging_station_id,
             </if>
-            <if test="null != chargingOrderId and '' != chargingOrderId">
-                charging_order_id,
+            <if test="null != chargeOrderId and '' != chargeOrderId">
+                charge_order_id,
             </if>
             <if test="null != userId and '' != userId">
                 user_id,
@@ -132,8 +132,8 @@
             <if test="null != chargingStationId and '' != chargingStationId">
                 #{chargingStationId},
             </if>
-            <if test="null != chargingOrderId and '' != chargingOrderId">
-                #{chargingOrderId},
+            <if test="null != chargeOrderId and '' != chargeOrderId">
+                #{chargeOrderId},
             </if>
             <if test="null != userId and '' != userId">
                 #{userId},
@@ -225,7 +225,7 @@
             <if test="null != chargingStationId and '' != chargingStationId">charging_station_id =
                 #{chargingStationId},
             </if>
-            <if test="null != chargingOrderId and '' != chargingOrderId">charging_order_id = #{chargingOrderId},</if>
+            <if test="null != chargeOrderId and '' != chargeOrderId">charge_order_id = #{chargeOrderId},</if>
             <if test="null != userId and '' != userId">user_id = #{userId},</if>
             <if test="null != terminalId and '' != terminalId">terminal_id = #{terminalId},</if>
             <if test="null != serialNumber and '' != serialNumber">serial_number = #{serialNumber},</if>
@@ -309,7 +309,7 @@
         FROM xhpc_history_order as ho
         LEFT JOIN xhpc_charging_station as cs on cs.charging_station_id = ho.charging_station_id
         LEFT JOIN xhpc_terminal as te on te.terminal_id = ho.terminal_id
-        left join xhpc_charge_order as co on co.charging_order_id =ho.charging_order_id
+        left join xhpc_charge_order as co on co.charge_order_id =ho.charge_order_id
         where ho.status=0 and ho.del_flag=0 and ho.user_id =#{userId}
     </select>
 
@@ -332,7 +332,7 @@
         FROM xhpc_history_order as ho
         LEFT JOIN xhpc_charging_station as cs on cs.charging_station_id = ho.charging_station_id
         LEFT JOIN xhpc_terminal as te on te.terminal_id = ho.terminal_id
-        left join xhpc_charge_order as co on co.charging_order_id =ho.charging_order_id
+        left join xhpc_charge_order as co on co.charge_order_id =ho.charge_order_id
         where ho.status=0 and ho.del_flag=0  and ho.history_order_id =#{historyOrderId}
         <if test="userId !=null">
             and ho.user_id =#{userId}