Perfecting the query_start_charge.

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcChargeOrderMapper.java

@@ -177,10 +177,20 @@ public interface XhpcChargeOrderMapper {
                  @Param(value = "chargingAmt") Integer chargingAmt,
                  @Param(value = "plateNum") String plateNum,
                  @Param(value = "status") Integer status,
-                 @Param(value = "createTime") Date createTime);
+                 @Param(value = "createTime") Date createTime,
+                 @Param(value = "rateModelId") Long rateModelId,
+                 @Param(value = "terminalId") Long terminalId,
+                 @Param(value = "power") Double power,
+                 @Param(value = "chargingStationId") Long chargingStationId,
+                 @Param(value = "chargingMode") String chargingMode);
 
     /**
      * 标记异常大于创建4小时，标记为异常
      */
-    void updateStatus();
+//    void updateStatus();
+    List<Map<String, Object>> selectDate3rdNeedBy(@Param(value = "serialNumber") String serialNumber);
+
+    String select3rdNameBy(@Param(value = "operatorIdEvcs") String operatorIdEvcs);
+
+
 }

xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java

@@ -472,7 +472,13 @@ 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, date);
+        Map<String, Object> extraData = xhpcChargeOrderMapper.selectDate3rdNeedBy(connectorId).get(0);
+        Long rateModelId = (Long) extraData.get("rateModelId");
+        Long terminalId = (Long) extraData.get("terminalId");
+        Double power = (Double) extraData.get("power");
+        Long chargingStationId = (Long) extraData.get("chargingStationId");
+        String chargingMode = xhpcChargeOrderMapper.select3rdNameBy(internetSerialNumber.substring(0, 9));
+        int res = xhpcChargeOrderMapper.addBy3rd(internetSerialNumber, orderNo, driverId, chargingAmt, plateNum, status, date, rateModelId, terminalId, power, chargingStationId, chargingMode);
         Map<String, Object> data = new HashMap<>();
         System.out.println(res);
         if (res != 0) {

xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcChargeOrderMapper.xml

@@ -504,7 +504,22 @@
         <if test="plateNum != null and plateNum != ''">
             Plate_num,
         </if>
-        status,source,create_time)
+        status,source,create_time,
+        <if test="rateModelId != null and rateModelId != ''">
+            rate_model_id,
+        </if>
+        <if test="terminalId != null and terminalId != ''">
+            terminal_id,
+        </if>
+        <if test="power != null and power != ''">
+            power,
+        </if>
+        <if test="chargingStationId != null and chargingStationId != ''">
+            charging_station_id,
+        </if>
+        <if test="chargingMode != null and chargingMode != ''">
+            charging_mode
+        </if>)
         values
         (#{internetSerialNumber},
         #{serialNum},
@@ -517,8 +532,43 @@
         <if test="plateNum != null and plateNum != ''">
             #{plateNum},
         </if>
-        #{status},1,#{createTime})
+        #{status},1,#{createTime}
+        <if test="rateModelId != null and rateModelId != ''">
+            ,#{rateModelId}
+        </if>
+        <if test="terminalId != null and terminalId != ''">
+            ,#{terminalId}
+        </if>
+        <if test="power != null and power != ''">
+            ,#{power}
+        </if>
+        <if test="chargingStationId != null and chargingStationId != ''">
+            ,#{chargingStationId}
+        </if>
+        <if test="chargingMode != null and chargingMode != ''">
+            ,#{chargingMode}
+        </if>
+        )
     </insert>
 
+    <select id="selectDate3rdNeedBy" resultType="map">
+
+        select xt.charging_station_id as chargingStationId,
+               xt.terminal_id         as terminalId,
+               xt.rate_model_id       as rateModelId,
+               power
+        from xhpc_terminal as xt
+                 left join xhpc_charging_pile as xcp
+                           on xcp.serial_number = substring(#{serialNumber}, 1, 14)
+        where xt.serial_number = #{serialNumber}
+    </select>
+
+    <select id="select3rdNameBy" resultType="java.lang.String">
+
+        select name
+        from xhpc_internet_user
+        where operator_id_evcs = #{operatorIdEvcs}
+    </select>
+
 
 </mapper>