From 24a1d74cf2fb4ca799a5ad4eb117cca05769b7be Mon Sep 17 00:00:00 2001
From: little-cat-sweet <851891179@qq.com>
Date: Wed, 10 Nov 2021 17:14:27 +0800
Subject: [PATCH] Perfecting the query_start_charge.

---
 .../order/mapper/XhpcChargeOrderMapper.java   |  3 ++-
 .../impl/XhpcChargeOrderServiceImpl.java      |  2 +-
 .../mapper/XhpcChargeOrderMapper.xml          | 20 +++++++++++++------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java
index b1d541de..e596f9a7 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java
@@ -176,7 +176,8 @@ public interface XhpcChargeOrderMapper {
                  @Param(value = "driverId") String driverId,
                  @Param(value = "chargingAmt") Integer chargingAmt,
                  @Param(value = "plateNum") String plateNum,
-                 @Param(value = "status") Integer status);
+                 @Param(value = "status") Integer status,
+                 @Param(value = "createTime") Date createTime);
 
     /**
      * 标记异常大于创建4小时，标记为异常
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 09ed4732..ad993ca2 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
@@ -471,7 +471,7 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
             return r;
         }
         String startTime = DateUtil.format(date, "yyyy-MM-dd HH: mm: ss");
-        int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status);
+        int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status, date);
         Map<String, Object> data = new HashMap<>();
         System.out.println(res);
         if (res != 0) {
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 a3b94da4..d306878e 100644
--- a/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
+++ b/xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml
@@ -495,21 +495,29 @@
         insert into xhpc_charge_order
         (internet_serial_number,
         serial_number,
-        driver_id,
-        charging_amt,
+        <if test=" driverId != null and driverId != ''">
+            driver_id,
+        </if>
+        <if test="chargingAmt != null and chargingAmt != ''">
+            charging_amt,
+        </if>
         <if test="plateNum != null and plateNum != ''">
             Plate_num,
         </if>
-        status,source)
+        status,source,create_time)
         values
         (#{internetSerialNumber},
         #{serialNum},
-        #{driverId},
-        #{chargingAmt},
+        <if test="driverId != null and driverId != ''">
+            #{driverId},
+        </if>
+        <if test="chargingAmt != null and chargingAmt != ''">
+            #{chargingAmt},
+        </if>
         <if test="plateNum != null and plateNum != ''">
             #{plateNum},
         </if>
-        #{status},1)
+        #{status},1,#{createTime})
     </insert>