diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java
index 52a330269..e38fbfaa9 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/enums/thirdparty/ThirdPlatformTypeEnum.java
@@ -28,6 +28,8 @@ public enum ThirdPlatformTypeEnum {
     GAN_SU_PLATFORM("17", "甘肃省平台", "MA01H3BQ9"),
     GUI_ZHOU_PLATFORM("18", "贵州省平台", "009390404"),
     NAN_RUI_PLATFORM("19", "南瑞平台", ""),
+
+    GUANG_XI_PLATFORM("20", "广西平台", ""),
     ;
 
     private String typeCode;
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java
index c4210798f..e883fed3a 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStartChargeDTO.java
@@ -75,4 +75,28 @@ public class QueryStartChargeDTO {
      * 支付方式(1-余额支付；3-白名单支付；4-微信支付；5-支付宝支付)
      */
     private String payMode;
+
+    /**
+     * 查询页码
+     */
+    @JsonProperty(value = "PageNo")
+    private Integer pageNo;
+
+    /**
+     * 每页数量
+     */
+    @JsonProperty(value = "PageSize")
+    private Integer pageSize;
+
+    /**
+     * 上次查询时间
+     */
+    @JsonProperty(value = "LastQueryTime")
+    private String lastQueryTime;
+
+    /**
+     * 上次查询结束时间
+     */
+    @JsonProperty(value = "LastQueryEndTime")
+    private String lastQueryEndTime;
 }
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationInfoDTO.java
index 3f2819529..9f99ce776 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationInfoDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryStationInfoDTO.java
@@ -70,6 +70,12 @@ public class QueryStationInfoDTO {
     @JsonProperty(value = "StationIDs")
     private List<String> stationIds;
 
+    /**
+     * 更多标志
+     */
+    @JsonProperty(value = "MoreFlag")
+    private Integer moreFlag;
+
 
     private String address;
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
index f093b9ac8..05dd2eabc 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
@@ -1,5 +1,6 @@
 package com.jsowell.pile.mapper;
 
+import com.alipay.api.domain.ChargeOrderInfo;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.OrderDetail;
 import com.jsowell.pile.dto.*;
@@ -394,4 +395,11 @@ public interface OrderBasicInfoMapper {
 
 
     List<String> tempGetOrderCodes(QueryOrderDTO dto);
+
+    /**
+     * 查询第三方平台订单列表
+     * @param dto
+     * @return
+     */
+    List<OrderVO> selectThirdPartyOrderList(@Param("dto") QueryStartChargeDTO dto);
 }
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
index 5b199ecfe..1f1a4b859 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
@@ -1,5 +1,6 @@
 package com.jsowell.pile.service;
 
+import com.alipay.api.domain.ChargeOrderInfo;
 import com.huifu.adapay.core.exception.BaseAdaPayException;
 import com.jsowell.adapay.response.PaymentReverseResponse;
 import com.jsowell.adapay.vo.OrderSplitResult;
@@ -476,6 +477,12 @@ public interface OrderBasicInfoService{
      */
     void createReservationOrder(ReservationChargingStartupResult chargingStartupResult);
 
+    /**
+     * 查询第三方平台订单列表
+     * @param dto
+     */
+    List<OrderVO> selectThirdPartyOrderList(QueryStartChargeDTO dto);
+
 
     //↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 后管小程序 ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index dcda77983..9d2f371d2 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -2,6 +2,7 @@ package com.jsowell.pile.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.alipay.api.domain.ChargeOrderInfo;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -2592,7 +2593,18 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
      */
     @Override
     public List<AccumulativeInfoVO> getAccumulativeInfoForLianLian(QueryStationInfoDTO dto) {
-        return orderBasicInfoMapper.getAccumulativeInfoForLianLian(dto);
+        List<AccumulativeInfoVO> accumulativeInfoList = orderBasicInfoMapper.getAccumulativeInfoForLianLian(dto);
+        for (AccumulativeInfoVO accumulativeInfoVO : accumulativeInfoList) {
+            String startTime = accumulativeInfoVO.getStartTime();
+            String endTime = accumulativeInfoVO.getEndTime();
+            if (startTime == null || endTime == null) {
+                continue;
+            }
+            // 计算充电时长
+            int chargingTime = Integer.parseInt(String.valueOf(DateUtils.intervalTime(startTime, endTime))) * 60;
+            accumulativeInfoVO.setChargingTime(String.valueOf(chargingTime));
+        }
+        return accumulativeInfoList;
     }
 
     /**
@@ -4096,6 +4108,15 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         orderPayRecordService.batchInsert(Lists.newArrayList(principalPayRecord));
     }
 
+    /**
+     * 查询第三方平订单列表
+     * @param dto
+     * @return
+     */
+    @Override
+    public List<OrderVO> selectThirdPartyOrderList(QueryStartChargeDTO dto) {
+        return orderBasicInfoMapper.selectThirdPartyOrderList(dto);
+    }
 
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
index 08309130d..d1f0d7e45 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java
@@ -1224,7 +1224,6 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 	public List<EquipmentInfo> getPileListForLianLian(String stationId) {
 		List<EquipmentInfo> resultList = new ArrayList<>();
 		// 通过站点id查询桩基本信息
-		// List<PileBasicInfo> list = this.getPileListByStationId(stationId);
 		List<PileDetailInfoVO> list = getPileDetailInfoList(stationId);
 		// 封装成联联平台对象
 		for (PileDetailInfoVO pileDetailInfoVO : list) {
@@ -1245,19 +1244,6 @@ public class PileBasicInfoServiceImpl implements PileBasicInfoService {
 			equipmentInfo.setEquipmentType(Integer.valueOf(pileDetailInfoVO.getSpeedType()));
 			equipmentInfo.setEquipmentModel(pileDetailInfoVO.getModelName());
 
-			// Map<String, String> pileStatus = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileBasicInfo.getSn()));
-			// Map<String, String> pileStatusMap = pileConnectorInfoService.getPileStatus(Lists.newArrayList(pileSn));
-			// String pileStatus = pileStatusMap.get(pileSn);
-			// if (StringUtils.equals(PileStatusEnum.ON_LINE.getValue(), pileStatus)) {
-			// 	// 1-在线
-			// 	pileStatus = LianLianPileStatusEnum.NORMAL.getCode();
-			// } else if (StringUtils.equals(PileStatusEnum.OFF_LINE.getValue(), pileStatus)) {
-			// 	// 2-离线
-			// 	pileStatus = LianLianPileStatusEnum.CLOSE_OFFLINE.getCode();
-			// } else if (StringUtils.equals(PileStatusEnum.FAULT.getValue(), pileStatus)) {
-			// 	// 3-故障
-			// 	pileStatus = LianLianPileStatusEnum.UNDER_MAINTENANCE.getCode();
-			// }
 			equipmentInfo.setEquipmentStatus(Integer.valueOf(pileDetailInfoVO.getPileStatus()));
 			equipmentInfo.setEquipmentPower(new BigDecimal(pileDetailInfoVO.getRatedPower()).setScale(1, BigDecimal.ROUND_HALF_UP));
 			equipmentInfo.setNewNationalStandard(1);
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java
index 526491d93..cf2713e27 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/lianlian/AccumulativeInfoVO.java
@@ -41,6 +41,11 @@ public class AccumulativeInfoVO {
      */
     private String endTime;
 
+    /**
+     * 充电时长
+     */
+    private String chargingTime;
+
     /**
      * 枪口充电量
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index fce21a633..53e4cfc8c 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -1,1654 +1,1670 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsowell.pile.mapper.OrderBasicInfoMapper">
-  <resultMap id="BaseResultMap" type="com.jsowell.pile.domain.OrderBasicInfo">
-    <!--@mbg.generated-->
-    <!--@Table order_basic_info-->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="order_code" jdbcType="VARCHAR" property="orderCode" />
-    <result column="transaction_code" jdbcType="VARCHAR" property="transactionCode" />
-    <result column="order_status" jdbcType="VARCHAR" property="orderStatus" />
-    <result column="member_id" jdbcType="VARCHAR" property="memberId" />
-    <result column="station_id" jdbcType="VARCHAR" property="stationId" />
-    <result column="merchant_id" jdbcType="VARCHAR" property="merchantId" />
-    <result column="pile_sn" jdbcType="VARCHAR" property="pileSn" />
-    <result column="connector_code" jdbcType="VARCHAR" property="connectorCode" />
-    <result column="pile_connector_code" jdbcType="VARCHAR" property="pileConnectorCode" />
-    <result column="logic_card" jdbcType="VARCHAR" property="logicCard" />
-    <result column="vin_code" jdbcType="VARCHAR" property="vinCode" />
-    <result column="start_mode" jdbcType="VARCHAR" property="startMode" />
-    <result column="third_party_type" jdbcType="VARCHAR" property="thirdPartyType" />
-    <result column="pay_mode" jdbcType="VARCHAR" property="payMode" />
-    <result column="pay_status" jdbcType="VARCHAR" property="payStatus" />
-    <result column="pay_amount" jdbcType="DECIMAL" property="payAmount" />
-    <result column="pay_time" jdbcType="TIMESTAMP" property="payTime" />
-    <result column="plate_number" jdbcType="VARCHAR" property="plateNumber" />
-    <result column="order_amount" jdbcType="DECIMAL" property="orderAmount" />
-    <result column="virtual_amount" jdbcType="DECIMAL" property="virtualAmount" />
-    <result column="group_code" jdbcType="VARCHAR" property="groupCode" />
-    <result column="discount_amount" jdbcType="DECIMAL" property="discountAmount" />
-    <result column="settle_amount" jdbcType="DECIMAL" property="settleAmount" />
-    <result column="remedial_amount" jdbcType="DECIMAL" property="remedialAmount" />
-    <result column="charge_start_time" jdbcType="TIMESTAMP" property="chargeStartTime" />
-    <result column="charge_end_time" jdbcType="TIMESTAMP" property="chargeEndTime" />
-    <result column="start_type" jdbcType="VARCHAR" property="startType" />
-    <result column="reserved_start_time" jdbcType="TIMESTAMP" property="reservedStartTime" />
-    <result column="reserved_end_time" jdbcType="TIMESTAMP" property="reservedEndTime" />
-    <result column="start_soc" jdbcType="VARCHAR" property="startSoc" />
-    <result column="end_soc" jdbcType="VARCHAR" property="endSoc" />
-    <result column="stop_reason_code" jdbcType="VARCHAR" property="stopReasonCode" />
-    <result column="reason" jdbcType="VARCHAR" property="reason" />
-    <result column="settlement_time" jdbcType="TIMESTAMP" property="settlementTime" />
-    <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount" />
-    <result column="refund_status" jdbcType="VARCHAR" property="refundStatus" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="del_flag" jdbcType="CHAR" property="delFlag" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--@mbg.generated-->
-    id, order_code, transaction_code, order_status, member_id, station_id, merchant_id, 
-    pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, third_party_type, 
-    pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, 
-    group_code, discount_amount, settle_amount, remedial_amount, charge_start_time, charge_end_time, 
-    start_type, reserved_start_time, reserved_end_time, start_soc, end_soc, stop_reason_code, reason, settlement_time, refund_amount,
-    refund_status, create_by, create_time, update_by, update_time, del_flag
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--@mbg.generated-->
-    select 
-    <include refid="Base_Column_List" />
-    from order_basic_info
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--@mbg.generated-->
-    delete from order_basic_info
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into order_basic_info (order_code, transaction_code, order_status, 
-      member_id, station_id, merchant_id, 
-      pile_sn, connector_code, pile_connector_code, 
-      logic_card, vin_code, start_mode, 
-      third_party_type, pay_mode, pay_status, 
-      pay_amount, pay_time, plate_number, 
-      order_amount, virtual_amount, group_code, 
-      discount_amount, settle_amount, remedial_amount, 
-      charge_start_time, charge_end_time, start_type,
-      reserved_start_time, reserved_end_time,
-      start_soc, end_soc, stop_reason_code,
-      reason, settlement_time, refund_amount, 
-      refund_status, create_by, create_time, 
-      update_by, update_time, del_flag
-      )
-    values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, 
-      #{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, 
-      #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR}, 
-      #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, 
-      #{thirdPartyType,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, 
-      #{payAmount,jdbcType=DECIMAL}, #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, 
-      #{orderAmount,jdbcType=DECIMAL}, #{virtualAmount,jdbcType=DECIMAL}, #{groupCode,jdbcType=VARCHAR}, 
-      #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, #{remedialAmount,jdbcType=DECIMAL}, 
-      #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR},
-      #{reservedStartTime,jdbcType=TIMESTAMP},#{reservedEndTime,jdbcType=TIMESTAMP},
-      #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, #{stopReasonCode,jdbcType=VARCHAR},
-      #{reason,jdbcType=VARCHAR}, #{settlementTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, 
-      #{refundStatus,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}
-      )
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into order_basic_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="orderCode != null">
-        order_code,
-      </if>
-      <if test="transactionCode != null">
-        transaction_code,
-      </if>
-      <if test="orderStatus != null">
-        order_status,
-      </if>
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="stationId != null">
-        station_id,
-      </if>
-      <if test="merchantId != null">
-        merchant_id,
-      </if>
-      <if test="pileSn != null">
-        pile_sn,
-      </if>
-      <if test="connectorCode != null">
-        connector_code,
-      </if>
-      <if test="pileConnectorCode != null">
-        pile_connector_code,
-      </if>
-      <if test="logicCard != null">
-        logic_card,
-      </if>
-      <if test="vinCode != null">
-        vin_code,
-      </if>
-      <if test="startMode != null">
-        start_mode,
-      </if>
-      <if test="thirdPartyType != null">
-        third_party_type,
-      </if>
-      <if test="payMode != null">
-        pay_mode,
-      </if>
-      <if test="payStatus != null">
-        pay_status,
-      </if>
-      <if test="payAmount != null">
-        pay_amount,
-      </if>
-      <if test="payTime != null">
-        pay_time,
-      </if>
-      <if test="plateNumber != null">
-        plate_number,
-      </if>
-      <if test="orderAmount != null">
-        order_amount,
-      </if>
-      <if test="virtualAmount != null">
-        virtual_amount,
-      </if>
-      <if test="groupCode != null">
-        group_code,
-      </if>
-      <if test="discountAmount != null">
-        discount_amount,
-      </if>
-      <if test="settleAmount != null">
-        settle_amount,
-      </if>
-      <if test="remedialAmount != null">
-        remedial_amount,
-      </if>
-      <if test="chargeStartTime != null">
-        charge_start_time,
-      </if>
-      <if test="chargeEndTime != null">
-        charge_end_time,
-      </if>
-      <if test="startType != null">
-        start_type,
-      </if>
-      <if test="reservedStartTime != null">
-        reserved_start_time,
-      </if>
-      <if test="reservedEndTime != null">
-        reserved_end_time,
-      </if>
-      <if test="startSoc != null">
-        start_soc,
-      </if>
-      <if test="endSoc != null">
-        end_soc,
-      </if>
-      <if test="stopReasonCode != null">
-        stop_reason_code,,
-      </if>
-      <if test="reason != null">
-        reason,
-      </if>
-      <if test="settlementTime != null">
-        settlement_time,
-      </if>
-      <if test="refundAmount != null">
-        refund_amount,
-      </if>
-      <if test="refundStatus != null">
-        refund_status,
-      </if>
-      <if test="createBy != null">
-        create_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateBy != null">
-        update_by,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="delFlag != null">
-        del_flag,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="orderCode != null">
-        #{orderCode,jdbcType=VARCHAR},
-      </if>
-      <if test="transactionCode != null">
-        #{transactionCode,jdbcType=VARCHAR},
-      </if>
-      <if test="orderStatus != null">
-        #{orderStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="memberId != null">
-        #{memberId,jdbcType=VARCHAR},
-      </if>
-      <if test="stationId != null">
-        #{stationId,jdbcType=VARCHAR},
-      </if>
-      <if test="merchantId != null">
-        #{merchantId,jdbcType=VARCHAR},
-      </if>
-      <if test="pileSn != null">
-        #{pileSn,jdbcType=VARCHAR},
-      </if>
-      <if test="connectorCode != null">
-        #{connectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="pileConnectorCode != null">
-        #{pileConnectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="logicCard != null">
-        #{logicCard,jdbcType=VARCHAR},
-      </if>
-      <if test="vinCode != null">
-        #{vinCode,jdbcType=VARCHAR},
-      </if>
-      <if test="startMode != null">
-        #{startMode,jdbcType=VARCHAR},
-      </if>
-      <if test="thirdPartyType != null">
-        #{thirdPartyType,jdbcType=VARCHAR},
-      </if>
-      <if test="payMode != null">
-        #{payMode,jdbcType=VARCHAR},
-      </if>
-      <if test="payStatus != null">
-        #{payStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="payAmount != null">
-        #{payAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="payTime != null">
-        #{payTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="plateNumber != null">
-        #{plateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="orderAmount != null">
-        #{orderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="virtualAmount != null">
-        #{virtualAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="groupCode != null">
-        #{groupCode,jdbcType=VARCHAR},
-      </if>
-      <if test="discountAmount != null">
-        #{discountAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="settleAmount != null">
-        #{settleAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="remedialAmount != null">
-        #{remedialAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="chargeStartTime != null">
-        #{chargeStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chargeEndTime != null">
-        #{chargeEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startType != null">
-        #{startType,jdbcType=VARCHAR},
-      </if>
-      <if test="reservedStartTime != null">
-        #{reservedStartTime},
-      </if>
-      <if test="reservedEndTime != null">
-        #{reservedEndTime},
-      </if>
-      <if test="startSoc != null">
-        #{startSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="endSoc != null">
-        #{endSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="stopReasonCode != null">
-        #{stopReasonCode,jdbcType=VARCHAR},
-      </if>
-      <if test="reason != null">
-        #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="settlementTime != null">
-        #{settlementTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="refundAmount != null">
-        #{refundAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="refundStatus != null">
-        #{refundStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        #{delFlag,jdbcType=CHAR},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.OrderBasicInfo">
-    <!--@mbg.generated-->
-    update order_basic_info
-    <set>
-      <if test="orderCode != null">
-        order_code = #{orderCode,jdbcType=VARCHAR},
-      </if>
-      <if test="transactionCode != null">
-        transaction_code = #{transactionCode,jdbcType=VARCHAR},
-      </if>
-      <if test="orderStatus != null">
-        order_status = #{orderStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="memberId != null">
-        member_id = #{memberId,jdbcType=VARCHAR},
-      </if>
-      <if test="stationId != null">
-        station_id = #{stationId,jdbcType=VARCHAR},
-      </if>
-      <if test="merchantId != null">
-        merchant_id = #{merchantId,jdbcType=VARCHAR},
-      </if>
-      <if test="pileSn != null">
-        pile_sn = #{pileSn,jdbcType=VARCHAR},
-      </if>
-      <if test="connectorCode != null">
-        connector_code = #{connectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="pileConnectorCode != null">
-        pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="logicCard != null">
-        logic_card = #{logicCard,jdbcType=VARCHAR},
-      </if>
-      <if test="vinCode != null">
-        vin_code = #{vinCode,jdbcType=VARCHAR},
-      </if>
-      <if test="startMode != null">
-        start_mode = #{startMode,jdbcType=VARCHAR},
-      </if>
-      <if test="thirdPartyType != null">
-        third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
-      </if>
-      <if test="payMode != null">
-        pay_mode = #{payMode,jdbcType=VARCHAR},
-      </if>
-      <if test="payStatus != null">
-        pay_status = #{payStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="payAmount != null">
-        pay_amount = #{payAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="payTime != null">
-        pay_time = #{payTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="plateNumber != null">
-        plate_number = #{plateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="orderAmount != null">
-        order_amount = #{orderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="virtualAmount != null">
-        virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="groupCode != null">
-        group_code = #{groupCode,jdbcType=VARCHAR},
-      </if>
-      <if test="discountAmount != null">
-        discount_amount = #{discountAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="settleAmount != null">
-        settle_amount = #{settleAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="remedialAmount != null">
-        remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="chargeStartTime != null">
-        charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chargeEndTime != null">
-        charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startType != null">
-        start_type = #{startType,jdbcType=VARCHAR},
-      </if>
-      <if test="reservedStartTime != null">
-        reserved_start_time = #{reservedStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reservedEndTime != null">
-        reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startSoc != null">
-        start_soc = #{startSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="endSoc != null">
-        end_soc = #{endSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="stopReasonCode != null">
-        stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
-      </if>
-      <if test="reason != null">
-        reason = #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="settlementTime != null">
-        settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="refundAmount != null">
-        refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="refundStatus != null">
-        refund_status = #{refundStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        create_by = #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        update_by = #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        del_flag = #{delFlag,jdbcType=CHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.jsowell.pile.domain.OrderBasicInfo">
-    <!--@mbg.generated-->
-    update order_basic_info
-    set order_code = #{orderCode,jdbcType=VARCHAR},
-      transaction_code = #{transactionCode,jdbcType=VARCHAR},
-      order_status = #{orderStatus,jdbcType=VARCHAR},
-      member_id = #{memberId,jdbcType=VARCHAR},
-      station_id = #{stationId,jdbcType=VARCHAR},
-      merchant_id = #{merchantId,jdbcType=VARCHAR},
-      pile_sn = #{pileSn,jdbcType=VARCHAR},
-      connector_code = #{connectorCode,jdbcType=VARCHAR},
-      pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR},
-      logic_card = #{logicCard,jdbcType=VARCHAR},
-      vin_code = #{vinCode,jdbcType=VARCHAR},
-      start_mode = #{startMode,jdbcType=VARCHAR},
-      third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
-      pay_mode = #{payMode,jdbcType=VARCHAR},
-      pay_status = #{payStatus,jdbcType=VARCHAR},
-      pay_amount = #{payAmount,jdbcType=DECIMAL},
-      pay_time = #{payTime,jdbcType=TIMESTAMP},
-      plate_number = #{plateNumber,jdbcType=VARCHAR},
-      order_amount = #{orderAmount,jdbcType=DECIMAL},
-      virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
-      group_code = #{groupCode,jdbcType=VARCHAR},
-      discount_amount = #{discountAmount,jdbcType=DECIMAL},
-      settle_amount = #{settleAmount,jdbcType=DECIMAL},
-      remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
-      charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
-      charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
-      start_type = #{startType,jdbcType=VARCHAR},
-      reserved_start_time = #{reservedStartTime,jdbcType=TIMESTAMP},
-      reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
-      start_soc = #{startSoc,jdbcType=VARCHAR},
-      end_soc = #{endSoc,jdbcType=VARCHAR},
-      stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
-      reason = #{reason,jdbcType=VARCHAR},
-      settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
-      refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      refund_status = #{refundStatus,jdbcType=VARCHAR},
-      create_by = #{createBy,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_by = #{updateBy,jdbcType=VARCHAR},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      del_flag = #{delFlag,jdbcType=CHAR}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateBatch" parameterType="java.util.List">
-    <!--@mbg.generated-->
-    update order_basic_info
-    <trim prefix="set" suffixOverrides=",">
-      <trim prefix="order_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="transaction_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.transactionCode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="order_status = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="member_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="station_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="merchant_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="pile_sn = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.pileSn,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="connector_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.connectorCode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="pile_connector_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.pileConnectorCode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="logic_card = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.logicCard,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="vin_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.vinCode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="start_mode = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="third_party_type = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="pay_mode = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="pay_status = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.payStatus,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="pay_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL}
-        </foreach>
-      </trim>
-      <trim prefix="pay_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.payTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="plate_number = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="order_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.orderAmount,jdbcType=DECIMAL}
-        </foreach>
-      </trim>
-      <trim prefix="virtual_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
-        </foreach>
-      </trim>
-      <trim prefix="group_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="discount_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL}
-        </foreach>
-      </trim>
-      <trim prefix="settle_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
-        </foreach>
-      </trim>
-      <trim prefix="remedial_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.remedialAmount,jdbcType=DECIMAL}
-        </foreach>
-      </trim>
-      <trim prefix="charge_start_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.chargeStartTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="charge_end_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.chargeEndTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="start_type = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.startType,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="reserved_start_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.reservedStartTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="reserved_end_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.reservedEndTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="start_soc = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.startSoc,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="end_soc = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="stop_reason_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="reason = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="settlement_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.settlementTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="refund_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
-        </foreach>
-      </trim>
-      <trim prefix="refund_status = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.refundStatus,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="create_by = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="create_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="update_by = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR}
-        </foreach>
-      </trim>
-      <trim prefix="update_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-      </trim>
-      <trim prefix="del_flag = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR}
-        </foreach>
-      </trim>
-    </trim>
-    where id in
-    <foreach close=")" collection="list" item="item" open="(" separator=", ">
-      #{item.id,jdbcType=INTEGER}
-    </foreach>
-  </update>
-  <update id="updateBatchSelective" parameterType="java.util.List">
-    <!--@mbg.generated-->
-    update order_basic_info
-    <trim prefix="set" suffixOverrides=",">
-      <trim prefix="order_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.orderCode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="transaction_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.transactionCode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.transactionCode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="order_status = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.orderStatus != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="member_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.memberId != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="station_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.stationId != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="merchant_id = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.merchantId != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="pile_sn = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.pileSn != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.pileSn,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="connector_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.connectorCode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.connectorCode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="pile_connector_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.pileConnectorCode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.pileConnectorCode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="logic_card = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.logicCard != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.logicCard,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="vin_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.vinCode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.vinCode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="start_mode = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.startMode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="third_party_type = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.thirdPartyType != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="pay_mode = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.payMode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="pay_status = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.payStatus != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.payStatus,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="pay_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.payAmount != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="pay_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.payTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.payTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="plate_number = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.plateNumber != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="order_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.orderAmount != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.orderAmount,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="virtual_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.virtualAmount != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="group_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.groupCode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="discount_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.discountAmount != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="settle_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.settleAmount != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="remedial_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.remedialAmount != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.remedialAmount,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="charge_start_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.chargeStartTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.chargeStartTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="charge_end_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.chargeEndTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.chargeEndTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="start_type = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.startType != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.startType,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="reserved_start_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.reservedStartTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.reservedStartTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="reserved_end_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.reservedEndTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.reservedEndTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="start_soc = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.startSoc != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.startSoc,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="end_soc = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.endSoc != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="stop_reason_code = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.stopReasonCode != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="reason = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.reason != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="settlement_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.settlementTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.settlementTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="refund_amount = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.refundAmount != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="refund_status = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.refundStatus != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.refundStatus,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="create_by = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.createBy != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="create_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.createTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="update_by = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.updateBy != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="update_time = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.updateTime != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP}
-          </if>
-        </foreach>
-      </trim>
-      <trim prefix="del_flag = case" suffix="end,">
-        <foreach collection="list" index="index" item="item">
-          <if test="item.delFlag != null">
-            when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR}
-          </if>
-        </foreach>
-      </trim>
-    </trim>
-    where id in
-    <foreach close=")" collection="list" item="item" open="(" separator=", ">
-      #{item.id,jdbcType=INTEGER}
-    </foreach>
-  </update>
-  <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into order_basic_info
-    (order_code, transaction_code, order_status, member_id, station_id, merchant_id, 
-      pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, 
-      third_party_type, pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, 
-      virtual_amount, group_code, discount_amount, settle_amount, remedial_amount, charge_start_time, 
-      charge_end_time, start_type, reserved_start_time, reserved_end_time, start_soc, end_soc, stop_reason_code, reason, settlement_time,
-      refund_amount, refund_status, create_by, create_time, update_by, update_time, del_flag
-      )
-    values
-    <foreach collection="list" item="item" separator=",">
-      (#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR}, #{item.orderStatus,jdbcType=VARCHAR}, 
-        #{item.memberId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, 
-        #{item.pileSn,jdbcType=VARCHAR}, #{item.connectorCode,jdbcType=VARCHAR}, #{item.pileConnectorCode,jdbcType=VARCHAR}, 
-        #{item.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,jdbcType=VARCHAR}, 
-        #{item.thirdPartyType,jdbcType=VARCHAR}, #{item.payMode,jdbcType=VARCHAR}, #{item.payStatus,jdbcType=VARCHAR}, 
-        #{item.payAmount,jdbcType=DECIMAL}, #{item.payTime,jdbcType=TIMESTAMP}, #{item.plateNumber,jdbcType=VARCHAR}, 
-        #{item.orderAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL}, #{item.groupCode,jdbcType=VARCHAR}, 
-        #{item.discountAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL}, 
-        #{item.remedialAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, 
-        #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR}, #{item.reservedStartTime,jdbcType=TIMESTAMP},
-      #{item.reservedEndTime,jdbcType=TIMESTAMP},
-        #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.stopReasonCode,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR},
-        #{item.settlementTime,jdbcType=TIMESTAMP}, #{item.refundAmount,jdbcType=DECIMAL}, 
-        #{item.refundStatus,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-        #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR}
+    <resultMap id="BaseResultMap" type="com.jsowell.pile.domain.OrderBasicInfo">
+        <!--@mbg.generated-->
+        <!--@Table order_basic_info-->
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="order_code" jdbcType="VARCHAR" property="orderCode"/>
+        <result column="transaction_code" jdbcType="VARCHAR" property="transactionCode"/>
+        <result column="order_status" jdbcType="VARCHAR" property="orderStatus"/>
+        <result column="member_id" jdbcType="VARCHAR" property="memberId"/>
+        <result column="station_id" jdbcType="VARCHAR" property="stationId"/>
+        <result column="merchant_id" jdbcType="VARCHAR" property="merchantId"/>
+        <result column="pile_sn" jdbcType="VARCHAR" property="pileSn"/>
+        <result column="connector_code" jdbcType="VARCHAR" property="connectorCode"/>
+        <result column="pile_connector_code" jdbcType="VARCHAR" property="pileConnectorCode"/>
+        <result column="logic_card" jdbcType="VARCHAR" property="logicCard"/>
+        <result column="vin_code" jdbcType="VARCHAR" property="vinCode"/>
+        <result column="start_mode" jdbcType="VARCHAR" property="startMode"/>
+        <result column="third_party_type" jdbcType="VARCHAR" property="thirdPartyType"/>
+        <result column="pay_mode" jdbcType="VARCHAR" property="payMode"/>
+        <result column="pay_status" jdbcType="VARCHAR" property="payStatus"/>
+        <result column="pay_amount" jdbcType="DECIMAL" property="payAmount"/>
+        <result column="pay_time" jdbcType="TIMESTAMP" property="payTime"/>
+        <result column="plate_number" jdbcType="VARCHAR" property="plateNumber"/>
+        <result column="order_amount" jdbcType="DECIMAL" property="orderAmount"/>
+        <result column="virtual_amount" jdbcType="DECIMAL" property="virtualAmount"/>
+        <result column="group_code" jdbcType="VARCHAR" property="groupCode"/>
+        <result column="discount_amount" jdbcType="DECIMAL" property="discountAmount"/>
+        <result column="settle_amount" jdbcType="DECIMAL" property="settleAmount"/>
+        <result column="remedial_amount" jdbcType="DECIMAL" property="remedialAmount"/>
+        <result column="charge_start_time" jdbcType="TIMESTAMP" property="chargeStartTime"/>
+        <result column="charge_end_time" jdbcType="TIMESTAMP" property="chargeEndTime"/>
+        <result column="start_type" jdbcType="VARCHAR" property="startType"/>
+        <result column="reserved_start_time" jdbcType="TIMESTAMP" property="reservedStartTime"/>
+        <result column="reserved_end_time" jdbcType="TIMESTAMP" property="reservedEndTime"/>
+        <result column="start_soc" jdbcType="VARCHAR" property="startSoc"/>
+        <result column="end_soc" jdbcType="VARCHAR" property="endSoc"/>
+        <result column="stop_reason_code" jdbcType="VARCHAR" property="stopReasonCode"/>
+        <result column="reason" jdbcType="VARCHAR" property="reason"/>
+        <result column="settlement_time" jdbcType="TIMESTAMP" property="settlementTime"/>
+        <result column="refund_amount" jdbcType="DECIMAL" property="refundAmount"/>
+        <result column="refund_status" jdbcType="VARCHAR" property="refundStatus"/>
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="CHAR" property="delFlag"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <!--@mbg.generated-->
+        id, order_code, transaction_code, order_status, member_id, station_id, merchant_id,
+        pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, third_party_type,
+        pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount,
+        group_code, discount_amount, settle_amount, remedial_amount, charge_start_time, charge_end_time,
+        start_type, reserved_start_time, reserved_end_time, start_soc, end_soc, stop_reason_code, reason,
+        settlement_time, refund_amount,
+        refund_status, create_by, create_time, update_by, update_time, del_flag
+    </sql>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+        <!--@mbg.generated-->
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where id = #{id,jdbcType=INTEGER}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+        <!--@mbg.generated-->
+        delete from order_basic_info
+        where id = #{id,jdbcType=INTEGER}
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo"
+            useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into order_basic_info (order_code, transaction_code, order_status,
+        member_id, station_id, merchant_id,
+        pile_sn, connector_code, pile_connector_code,
+        logic_card, vin_code, start_mode,
+        third_party_type, pay_mode, pay_status,
+        pay_amount, pay_time, plate_number,
+        order_amount, virtual_amount, group_code,
+        discount_amount, settle_amount, remedial_amount,
+        charge_start_time, charge_end_time, start_type,
+        reserved_start_time, reserved_end_time,
+        start_soc, end_soc, stop_reason_code,
+        reason, settlement_time, refund_amount,
+        refund_status, create_by, create_time,
+        update_by, update_time, del_flag
         )
-    </foreach>
-  </insert>
-  <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into order_basic_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      order_code,
-      transaction_code,
-      order_status,
-      member_id,
-      station_id,
-      merchant_id,
-      pile_sn,
-      connector_code,
-      pile_connector_code,
-      logic_card,
-      vin_code,
-      start_mode,
-      third_party_type,
-      pay_mode,
-      pay_status,
-      pay_amount,
-      pay_time,
-      plate_number,
-      order_amount,
-      virtual_amount,
-      group_code,
-      discount_amount,
-      settle_amount,
-      remedial_amount,
-      charge_start_time,
-      charge_end_time,
-      start_type,
-      reserved_start_time,
-      reserved_end_time,
-      start_soc,
-      end_soc,
-      stop_reason_code,
-      reason,
-      settlement_time,
-      refund_amount,
-      refund_status,
-      create_by,
-      create_time,
-      update_by,
-      update_time,
-      del_flag,
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      #{orderCode,jdbcType=VARCHAR},
-      #{transactionCode,jdbcType=VARCHAR},
-      #{orderStatus,jdbcType=VARCHAR},
-      #{memberId,jdbcType=VARCHAR},
-      #{stationId,jdbcType=VARCHAR},
-      #{merchantId,jdbcType=VARCHAR},
-      #{pileSn,jdbcType=VARCHAR},
-      #{connectorCode,jdbcType=VARCHAR},
-      #{pileConnectorCode,jdbcType=VARCHAR},
-      #{logicCard,jdbcType=VARCHAR},
-      #{vinCode,jdbcType=VARCHAR},
-      #{startMode,jdbcType=VARCHAR},
-      #{thirdPartyType,jdbcType=VARCHAR},
-      #{payMode,jdbcType=VARCHAR},
-      #{payStatus,jdbcType=VARCHAR},
-      #{payAmount,jdbcType=DECIMAL},
-      #{payTime,jdbcType=TIMESTAMP},
-      #{plateNumber,jdbcType=VARCHAR},
-      #{orderAmount,jdbcType=DECIMAL},
-      #{virtualAmount,jdbcType=DECIMAL},
-      #{groupCode,jdbcType=VARCHAR},
-      #{discountAmount,jdbcType=DECIMAL},
-      #{settleAmount,jdbcType=DECIMAL},
-      #{remedialAmount,jdbcType=DECIMAL},
-      #{chargeStartTime,jdbcType=TIMESTAMP},
-      #{chargeEndTime,jdbcType=TIMESTAMP},
-      #{startType,jdbcType=VARCHAR},
-      #{reservedStartTime,jdbcType=TIMESTAMP},
-      #{reservedEndTime,jdbcType=TIMESTAMP},
-      #{startSoc,jdbcType=VARCHAR},
-      #{endSoc,jdbcType=VARCHAR},
-      #{stopReasonCode,jdbcType=VARCHAR},
-      #{reason,jdbcType=VARCHAR},
-      #{settlementTime,jdbcType=TIMESTAMP},
-      #{refundAmount,jdbcType=DECIMAL},
-      #{refundStatus,jdbcType=VARCHAR},
-      #{createBy,jdbcType=VARCHAR},
-      #{createTime,jdbcType=TIMESTAMP},
-      #{updateBy,jdbcType=VARCHAR},
-      #{updateTime,jdbcType=TIMESTAMP},
-      #{delFlag,jdbcType=CHAR},
-    </trim>
-    on duplicate key update 
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      order_code = #{orderCode,jdbcType=VARCHAR},
-      transaction_code = #{transactionCode,jdbcType=VARCHAR},
-      order_status = #{orderStatus,jdbcType=VARCHAR},
-      member_id = #{memberId,jdbcType=VARCHAR},
-      station_id = #{stationId,jdbcType=VARCHAR},
-      merchant_id = #{merchantId,jdbcType=VARCHAR},
-      pile_sn = #{pileSn,jdbcType=VARCHAR},
-      connector_code = #{connectorCode,jdbcType=VARCHAR},
-      pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR},
-      logic_card = #{logicCard,jdbcType=VARCHAR},
-      vin_code = #{vinCode,jdbcType=VARCHAR},
-      start_mode = #{startMode,jdbcType=VARCHAR},
-      third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
-      pay_mode = #{payMode,jdbcType=VARCHAR},
-      pay_status = #{payStatus,jdbcType=VARCHAR},
-      pay_amount = #{payAmount,jdbcType=DECIMAL},
-      pay_time = #{payTime,jdbcType=TIMESTAMP},
-      plate_number = #{plateNumber,jdbcType=VARCHAR},
-      order_amount = #{orderAmount,jdbcType=DECIMAL},
-      virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
-      group_code = #{groupCode,jdbcType=VARCHAR},
-      discount_amount = #{discountAmount,jdbcType=DECIMAL},
-      settle_amount = #{settleAmount,jdbcType=DECIMAL},
-      remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
-      charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
-      charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
-      start_type = #{startType,jdbcType=VARCHAR},
-      reserved_start_time = #{reservedStartTime,jdbcType=TIMESTAMP},
-      reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
-      start_soc = #{startSoc,jdbcType=VARCHAR},
-      end_soc = #{endSoc,jdbcType=VARCHAR},
-      stop_reason_code = {stopReasonCode,jdbcType=VARCHAR},
-      reason = #{reason,jdbcType=VARCHAR},
-      settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
-      refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      refund_status = #{refundStatus,jdbcType=VARCHAR},
-      create_by = #{createBy,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_by = #{updateBy,jdbcType=VARCHAR},
-      update_time = #{updateTime,jdbcType=TIMESTAMP},
-      del_flag = #{delFlag,jdbcType=CHAR},
-    </trim>
-  </insert>
-  <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
-    <!--@mbg.generated-->
-    insert into order_basic_info
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="orderCode != null">
-        order_code,
-      </if>
-      <if test="transactionCode != null">
-        transaction_code,
-      </if>
-      <if test="orderStatus != null">
-        order_status,
-      </if>
-      <if test="memberId != null">
-        member_id,
-      </if>
-      <if test="stationId != null">
-        station_id,
-      </if>
-      <if test="merchantId != null">
-        merchant_id,
-      </if>
-      <if test="pileSn != null">
-        pile_sn,
-      </if>
-      <if test="connectorCode != null">
-        connector_code,
-      </if>
-      <if test="pileConnectorCode != null">
-        pile_connector_code,
-      </if>
-      <if test="logicCard != null">
-        logic_card,
-      </if>
-      <if test="vinCode != null">
-        vin_code,
-      </if>
-      <if test="startMode != null">
-        start_mode,
-      </if>
-      <if test="thirdPartyType != null">
-        third_party_type,
-      </if>
-      <if test="payMode != null">
-        pay_mode,
-      </if>
-      <if test="payStatus != null">
-        pay_status,
-      </if>
-      <if test="payAmount != null">
-        pay_amount,
-      </if>
-      <if test="payTime != null">
-        pay_time,
-      </if>
-      <if test="plateNumber != null">
-        plate_number,
-      </if>
-      <if test="orderAmount != null">
-        order_amount,
-      </if>
-      <if test="virtualAmount != null">
-        virtual_amount,
-      </if>
-      <if test="groupCode != null">
-        group_code,
-      </if>
-      <if test="discountAmount != null">
-        discount_amount,
-      </if>
-      <if test="settleAmount != null">
-        settle_amount,
-      </if>
-      <if test="remedialAmount != null">
-        remedial_amount,
-      </if>
-      <if test="chargeStartTime != null">
-        charge_start_time,
-      </if>
-      <if test="chargeEndTime != null">
-        charge_end_time,
-      </if>
-      <if test="startType != null">
-        start_type,
-      </if>
-      <if test="reservedStartTime != null">
-        reserved_start_time,
-      </if>
-      <if test="reservedEndTime != null">
-        reserved_end_time,
-      </if>
-      <if test="startSoc != null">
-        start_soc,
-      </if>
-      <if test="endSoc != null">
-        end_soc,
-      </if>
-      <if test="stopReasonCode != null">
-        stop_reason_code,
-      </if>
-      <if test="reason != null">
-        reason,
-      </if>
-      <if test="settlementTime != null">
-        settlement_time,
-      </if>
-      <if test="refundAmount != null">
-        refund_amount,
-      </if>
-      <if test="refundStatus != null">
-        refund_status,
-      </if>
-      <if test="createBy != null">
-        create_by,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateBy != null">
-        update_by,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="delFlag != null">
-        del_flag,
-      </if>
-    </trim>
-    values
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="orderCode != null">
-        #{orderCode,jdbcType=VARCHAR},
-      </if>
-      <if test="transactionCode != null">
-        #{transactionCode,jdbcType=VARCHAR},
-      </if>
-      <if test="orderStatus != null">
-        #{orderStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="memberId != null">
-        #{memberId,jdbcType=VARCHAR},
-      </if>
-      <if test="stationId != null">
-        #{stationId,jdbcType=VARCHAR},
-      </if>
-      <if test="merchantId != null">
-        #{merchantId,jdbcType=VARCHAR},
-      </if>
-      <if test="pileSn != null">
-        #{pileSn,jdbcType=VARCHAR},
-      </if>
-      <if test="connectorCode != null">
-        #{connectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="pileConnectorCode != null">
-        #{pileConnectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="logicCard != null">
-        #{logicCard,jdbcType=VARCHAR},
-      </if>
-      <if test="vinCode != null">
-        #{vinCode,jdbcType=VARCHAR},
-      </if>
-      <if test="startMode != null">
-        #{startMode,jdbcType=VARCHAR},
-      </if>
-      <if test="thirdPartyType != null">
-        #{thirdPartyType,jdbcType=VARCHAR},
-      </if>
-      <if test="payMode != null">
-        #{payMode,jdbcType=VARCHAR},
-      </if>
-      <if test="payStatus != null">
-        #{payStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="payAmount != null">
-        #{payAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="payTime != null">
-        #{payTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="plateNumber != null">
-        #{plateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="orderAmount != null">
-        #{orderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="virtualAmount != null">
-        #{virtualAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="groupCode != null">
-        #{groupCode,jdbcType=VARCHAR},
-      </if>
-      <if test="discountAmount != null">
-        #{discountAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="settleAmount != null">
-        #{settleAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="remedialAmount != null">
-        #{remedialAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="chargeStartTime != null">
-        #{chargeStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chargeEndTime != null">
-        #{chargeEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startType != null">
-        #{startType,jdbcType=VARCHAR},
-      </if>
-      <if test="reservedStartTime != null">
-        #{reservedStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reservedEndTime != null">
-        #{reservedEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startSoc != null">
-        #{startSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="endSoc != null">
-        #{endSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="stopReasonCode != null">
-        #{stopReasonCode,jdbcType=VARCHAR},
-      </if>
-      <if test="reason != null">
-        #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="settlementTime != null">
-        #{settlementTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="refundAmount != null">
-        #{refundAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="refundStatus != null">
-        #{refundStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
-        #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        #{delFlag,jdbcType=CHAR},
-      </if>
-    </trim>
-    on duplicate key update 
-    <trim suffixOverrides=",">
-      <if test="id != null">
-        id = #{id,jdbcType=INTEGER},
-      </if>
-      <if test="orderCode != null">
-        order_code = #{orderCode,jdbcType=VARCHAR},
-      </if>
-      <if test="transactionCode != null">
+        values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR},
+        #{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR},
+        #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR},
+        #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR},
+        #{thirdPartyType,jdbcType=VARCHAR}, #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR},
+        #{payAmount,jdbcType=DECIMAL}, #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR},
+        #{orderAmount,jdbcType=DECIMAL}, #{virtualAmount,jdbcType=DECIMAL}, #{groupCode,jdbcType=VARCHAR},
+        #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, #{remedialAmount,jdbcType=DECIMAL},
+        #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR},
+        #{reservedStartTime,jdbcType=TIMESTAMP},#{reservedEndTime,jdbcType=TIMESTAMP},
+        #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, #{stopReasonCode,jdbcType=VARCHAR},
+        #{reason,jdbcType=VARCHAR}, #{settlementTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL},
+        #{refundStatus,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+        #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo"
+            useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into order_basic_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderCode != null">
+                order_code,
+            </if>
+            <if test="transactionCode != null">
+                transaction_code,
+            </if>
+            <if test="orderStatus != null">
+                order_status,
+            </if>
+            <if test="memberId != null">
+                member_id,
+            </if>
+            <if test="stationId != null">
+                station_id,
+            </if>
+            <if test="merchantId != null">
+                merchant_id,
+            </if>
+            <if test="pileSn != null">
+                pile_sn,
+            </if>
+            <if test="connectorCode != null">
+                connector_code,
+            </if>
+            <if test="pileConnectorCode != null">
+                pile_connector_code,
+            </if>
+            <if test="logicCard != null">
+                logic_card,
+            </if>
+            <if test="vinCode != null">
+                vin_code,
+            </if>
+            <if test="startMode != null">
+                start_mode,
+            </if>
+            <if test="thirdPartyType != null">
+                third_party_type,
+            </if>
+            <if test="payMode != null">
+                pay_mode,
+            </if>
+            <if test="payStatus != null">
+                pay_status,
+            </if>
+            <if test="payAmount != null">
+                pay_amount,
+            </if>
+            <if test="payTime != null">
+                pay_time,
+            </if>
+            <if test="plateNumber != null">
+                plate_number,
+            </if>
+            <if test="orderAmount != null">
+                order_amount,
+            </if>
+            <if test="virtualAmount != null">
+                virtual_amount,
+            </if>
+            <if test="groupCode != null">
+                group_code,
+            </if>
+            <if test="discountAmount != null">
+                discount_amount,
+            </if>
+            <if test="settleAmount != null">
+                settle_amount,
+            </if>
+            <if test="remedialAmount != null">
+                remedial_amount,
+            </if>
+            <if test="chargeStartTime != null">
+                charge_start_time,
+            </if>
+            <if test="chargeEndTime != null">
+                charge_end_time,
+            </if>
+            <if test="startType != null">
+                start_type,
+            </if>
+            <if test="reservedStartTime != null">
+                reserved_start_time,
+            </if>
+            <if test="reservedEndTime != null">
+                reserved_end_time,
+            </if>
+            <if test="startSoc != null">
+                start_soc,
+            </if>
+            <if test="endSoc != null">
+                end_soc,
+            </if>
+            <if test="stopReasonCode != null">
+                stop_reason_code,,
+            </if>
+            <if test="reason != null">
+                reason,
+            </if>
+            <if test="settlementTime != null">
+                settlement_time,
+            </if>
+            <if test="refundAmount != null">
+                refund_amount,
+            </if>
+            <if test="refundStatus != null">
+                refund_status,
+            </if>
+            <if test="createBy != null">
+                create_by,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateBy != null">
+                update_by,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="delFlag != null">
+                del_flag,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderCode != null">
+                #{orderCode,jdbcType=VARCHAR},
+            </if>
+            <if test="transactionCode != null">
+                #{transactionCode,jdbcType=VARCHAR},
+            </if>
+            <if test="orderStatus != null">
+                #{orderStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="memberId != null">
+                #{memberId,jdbcType=VARCHAR},
+            </if>
+            <if test="stationId != null">
+                #{stationId,jdbcType=VARCHAR},
+            </if>
+            <if test="merchantId != null">
+                #{merchantId,jdbcType=VARCHAR},
+            </if>
+            <if test="pileSn != null">
+                #{pileSn,jdbcType=VARCHAR},
+            </if>
+            <if test="connectorCode != null">
+                #{connectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="pileConnectorCode != null">
+                #{pileConnectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="logicCard != null">
+                #{logicCard,jdbcType=VARCHAR},
+            </if>
+            <if test="vinCode != null">
+                #{vinCode,jdbcType=VARCHAR},
+            </if>
+            <if test="startMode != null">
+                #{startMode,jdbcType=VARCHAR},
+            </if>
+            <if test="thirdPartyType != null">
+                #{thirdPartyType,jdbcType=VARCHAR},
+            </if>
+            <if test="payMode != null">
+                #{payMode,jdbcType=VARCHAR},
+            </if>
+            <if test="payStatus != null">
+                #{payStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="payAmount != null">
+                #{payAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="payTime != null">
+                #{payTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="plateNumber != null">
+                #{plateNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="orderAmount != null">
+                #{orderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="virtualAmount != null">
+                #{virtualAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupCode != null">
+                #{groupCode,jdbcType=VARCHAR},
+            </if>
+            <if test="discountAmount != null">
+                #{discountAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="settleAmount != null">
+                #{settleAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="remedialAmount != null">
+                #{remedialAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="chargeStartTime != null">
+                #{chargeStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="chargeEndTime != null">
+                #{chargeEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="startType != null">
+                #{startType,jdbcType=VARCHAR},
+            </if>
+            <if test="reservedStartTime != null">
+                #{reservedStartTime},
+            </if>
+            <if test="reservedEndTime != null">
+                #{reservedEndTime},
+            </if>
+            <if test="startSoc != null">
+                #{startSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="endSoc != null">
+                #{endSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="stopReasonCode != null">
+                #{stopReasonCode,jdbcType=VARCHAR},
+            </if>
+            <if test="reason != null">
+                #{reason,jdbcType=VARCHAR},
+            </if>
+            <if test="settlementTime != null">
+                #{settlementTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="refundAmount != null">
+                #{refundAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="refundStatus != null">
+                #{refundStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy != null">
+                #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=CHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.OrderBasicInfo">
+        <!--@mbg.generated-->
+        update order_basic_info
+        <set>
+            <if test="orderCode != null">
+                order_code = #{orderCode,jdbcType=VARCHAR},
+            </if>
+            <if test="transactionCode != null">
+                transaction_code = #{transactionCode,jdbcType=VARCHAR},
+            </if>
+            <if test="orderStatus != null">
+                order_status = #{orderStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="memberId != null">
+                member_id = #{memberId,jdbcType=VARCHAR},
+            </if>
+            <if test="stationId != null">
+                station_id = #{stationId,jdbcType=VARCHAR},
+            </if>
+            <if test="merchantId != null">
+                merchant_id = #{merchantId,jdbcType=VARCHAR},
+            </if>
+            <if test="pileSn != null">
+                pile_sn = #{pileSn,jdbcType=VARCHAR},
+            </if>
+            <if test="connectorCode != null">
+                connector_code = #{connectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="pileConnectorCode != null">
+                pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="logicCard != null">
+                logic_card = #{logicCard,jdbcType=VARCHAR},
+            </if>
+            <if test="vinCode != null">
+                vin_code = #{vinCode,jdbcType=VARCHAR},
+            </if>
+            <if test="startMode != null">
+                start_mode = #{startMode,jdbcType=VARCHAR},
+            </if>
+            <if test="thirdPartyType != null">
+                third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
+            </if>
+            <if test="payMode != null">
+                pay_mode = #{payMode,jdbcType=VARCHAR},
+            </if>
+            <if test="payStatus != null">
+                pay_status = #{payStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="payAmount != null">
+                pay_amount = #{payAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="payTime != null">
+                pay_time = #{payTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="plateNumber != null">
+                plate_number = #{plateNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="orderAmount != null">
+                order_amount = #{orderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="virtualAmount != null">
+                virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupCode != null">
+                group_code = #{groupCode,jdbcType=VARCHAR},
+            </if>
+            <if test="discountAmount != null">
+                discount_amount = #{discountAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="settleAmount != null">
+                settle_amount = #{settleAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="remedialAmount != null">
+                remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="chargeStartTime != null">
+                charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="chargeEndTime != null">
+                charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="startType != null">
+                start_type = #{startType,jdbcType=VARCHAR},
+            </if>
+            <if test="reservedStartTime != null">
+                reserved_start_time = #{reservedStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="reservedEndTime != null">
+                reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="startSoc != null">
+                start_soc = #{startSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="endSoc != null">
+                end_soc = #{endSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="stopReasonCode != null">
+                stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
+            </if>
+            <if test="reason != null">
+                reason = #{reason,jdbcType=VARCHAR},
+            </if>
+            <if test="settlementTime != null">
+                settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="refundAmount != null">
+                refund_amount = #{refundAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="refundStatus != null">
+                refund_status = #{refundStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy != null">
+                create_by = #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                update_by = #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                del_flag = #{delFlag,jdbcType=CHAR},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.jsowell.pile.domain.OrderBasicInfo">
+        <!--@mbg.generated-->
+        update order_basic_info
+        set order_code = #{orderCode,jdbcType=VARCHAR},
         transaction_code = #{transactionCode,jdbcType=VARCHAR},
-      </if>
-      <if test="orderStatus != null">
         order_status = #{orderStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="memberId != null">
         member_id = #{memberId,jdbcType=VARCHAR},
-      </if>
-      <if test="stationId != null">
         station_id = #{stationId,jdbcType=VARCHAR},
-      </if>
-      <if test="merchantId != null">
         merchant_id = #{merchantId,jdbcType=VARCHAR},
-      </if>
-      <if test="pileSn != null">
         pile_sn = #{pileSn,jdbcType=VARCHAR},
-      </if>
-      <if test="connectorCode != null">
         connector_code = #{connectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="pileConnectorCode != null">
         pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR},
-      </if>
-      <if test="logicCard != null">
         logic_card = #{logicCard,jdbcType=VARCHAR},
-      </if>
-      <if test="vinCode != null">
         vin_code = #{vinCode,jdbcType=VARCHAR},
-      </if>
-      <if test="startMode != null">
         start_mode = #{startMode,jdbcType=VARCHAR},
-      </if>
-      <if test="thirdPartyType != null">
         third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
-      </if>
-      <if test="payMode != null">
         pay_mode = #{payMode,jdbcType=VARCHAR},
-      </if>
-      <if test="payStatus != null">
         pay_status = #{payStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="payAmount != null">
         pay_amount = #{payAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="payTime != null">
         pay_time = #{payTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="plateNumber != null">
         plate_number = #{plateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="orderAmount != null">
         order_amount = #{orderAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="virtualAmount != null">
         virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="groupCode != null">
         group_code = #{groupCode,jdbcType=VARCHAR},
-      </if>
-      <if test="discountAmount != null">
         discount_amount = #{discountAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="settleAmount != null">
         settle_amount = #{settleAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="remedialAmount != null">
         remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="chargeStartTime != null">
         charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="chargeEndTime != null">
         charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startType != null">
         start_type = #{startType,jdbcType=VARCHAR},
-      </if>
-      <if test="reservedStartTime != null">
         reserved_start_time = #{reservedStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="reservedEndTime != null">
         reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="startSoc != null">
         start_soc = #{startSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="endSoc != null">
         end_soc = #{endSoc,jdbcType=VARCHAR},
-      </if>
-      <if test="stopReasonCode != null">
         stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
-      </if>
-      <if test="reason != null">
         reason = #{reason,jdbcType=VARCHAR},
-      </if>
-      <if test="settlementTime != null">
         settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="refundAmount != null">
         refund_amount = #{refundAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="refundStatus != null">
         refund_status = #{refundStatus,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
         create_by = #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateBy != null">
         update_by = #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        del_flag = #{delFlag,jdbcType=CHAR},
-      </if>
-    </trim>
-  </insert>
+        del_flag = #{delFlag,jdbcType=CHAR}
+        where id = #{id,jdbcType=INTEGER}
+    </update>
+    <update id="updateBatch" parameterType="java.util.List">
+        <!--@mbg.generated-->
+        update order_basic_info
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="order_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="transaction_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.transactionCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="order_status = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="member_id = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="station_id = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="merchant_id = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="pile_sn = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.pileSn,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="connector_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.connectorCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="pile_connector_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.pileConnectorCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="logic_card = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.logicCard,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="vin_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.vinCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="start_mode = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="third_party_type = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="pay_mode = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="pay_status = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.payStatus,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="pay_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL}
+                </foreach>
+            </trim>
+            <trim prefix="pay_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.payTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="plate_number = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="order_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.orderAmount,jdbcType=DECIMAL}
+                </foreach>
+            </trim>
+            <trim prefix="virtual_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
+                </foreach>
+            </trim>
+            <trim prefix="group_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="discount_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL}
+                </foreach>
+            </trim>
+            <trim prefix="settle_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
+                </foreach>
+            </trim>
+            <trim prefix="remedial_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.remedialAmount,jdbcType=DECIMAL}
+                </foreach>
+            </trim>
+            <trim prefix="charge_start_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.chargeStartTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="charge_end_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.chargeEndTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="start_type = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.startType,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="reserved_start_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.reservedStartTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="reserved_end_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.reservedEndTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="start_soc = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.startSoc,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="end_soc = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="stop_reason_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="reason = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="settlement_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.settlementTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="refund_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
+                </foreach>
+            </trim>
+            <trim prefix="refund_status = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.refundStatus,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="create_by = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="create_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="update_by = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR}
+                </foreach>
+            </trim>
+            <trim prefix="update_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP}
+                </foreach>
+            </trim>
+            <trim prefix="del_flag = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR}
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach close=")" collection="list" item="item" open="(" separator=", ">
+            #{item.id,jdbcType=INTEGER}
+        </foreach>
+    </update>
+    <update id="updateBatchSelective" parameterType="java.util.List">
+        <!--@mbg.generated-->
+        update order_basic_info
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="order_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.orderCode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="transaction_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.transactionCode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.transactionCode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="order_status = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.orderStatus != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="member_id = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.memberId != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="station_id = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.stationId != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="merchant_id = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.merchantId != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pile_sn = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.pileSn != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.pileSn,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="connector_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.connectorCode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.connectorCode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pile_connector_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.pileConnectorCode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.pileConnectorCode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="logic_card = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.logicCard != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.logicCard,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="vin_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.vinCode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.vinCode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="start_mode = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.startMode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="third_party_type = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.thirdPartyType != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.thirdPartyType,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pay_mode = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.payMode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pay_status = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.payStatus != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.payStatus,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pay_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.payAmount != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pay_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.payTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.payTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="plate_number = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.plateNumber != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="order_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.orderAmount != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.orderAmount,jdbcType=DECIMAL}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="virtual_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.virtualAmount != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="group_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.groupCode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.groupCode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="discount_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.discountAmount != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="settle_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.settleAmount != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="remedial_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.remedialAmount != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.remedialAmount,jdbcType=DECIMAL}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="charge_start_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.chargeStartTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.chargeStartTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="charge_end_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.chargeEndTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.chargeEndTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="start_type = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.startType != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.startType,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="reserved_start_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.reservedStartTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.reservedStartTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="reserved_end_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.reservedEndTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.reservedEndTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="start_soc = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.startSoc != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.startSoc,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="end_soc = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.endSoc != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="stop_reason_code = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.stopReasonCode != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.stopReasonCode,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="reason = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.reason != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="settlement_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.settlementTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.settlementTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="refund_amount = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.refundAmount != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="refund_status = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.refundStatus != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.refundStatus,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="create_by = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.createBy != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="create_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.createTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="update_by = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.updateBy != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="update_time = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.updateTime != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="del_flag = case" suffix="end,">
+                <foreach collection="list" index="index" item="item">
+                    <if test="item.delFlag != null">
+                        when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR}
+                    </if>
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach close=")" collection="list" item="item" open="(" separator=", ">
+            #{item.id,jdbcType=INTEGER}
+        </foreach>
+    </update>
+    <insert id="batchInsert" keyColumn="id" keyProperty="id" parameterType="map" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into order_basic_info
+        (order_code, transaction_code, order_status, member_id, station_id, merchant_id,
+        pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode,
+        third_party_type, pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount,
+        virtual_amount, group_code, discount_amount, settle_amount, remedial_amount, charge_start_time,
+        charge_end_time, start_type, reserved_start_time, reserved_end_time, start_soc, end_soc, stop_reason_code,
+        reason, settlement_time,
+        refund_amount, refund_status, create_by, create_time, update_by, update_time, del_flag
+        )
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR},
+            #{item.orderStatus,jdbcType=VARCHAR},
+            #{item.memberId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR},
+            #{item.pileSn,jdbcType=VARCHAR}, #{item.connectorCode,jdbcType=VARCHAR},
+            #{item.pileConnectorCode,jdbcType=VARCHAR},
+            #{item.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,jdbcType=VARCHAR},
+            #{item.thirdPartyType,jdbcType=VARCHAR}, #{item.payMode,jdbcType=VARCHAR},
+            #{item.payStatus,jdbcType=VARCHAR},
+            #{item.payAmount,jdbcType=DECIMAL}, #{item.payTime,jdbcType=TIMESTAMP},
+            #{item.plateNumber,jdbcType=VARCHAR},
+            #{item.orderAmount,jdbcType=DECIMAL}, #{item.virtualAmount,jdbcType=DECIMAL},
+            #{item.groupCode,jdbcType=VARCHAR},
+            #{item.discountAmount,jdbcType=DECIMAL}, #{item.settleAmount,jdbcType=DECIMAL},
+            #{item.remedialAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP},
+            #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR},
+            #{item.reservedStartTime,jdbcType=TIMESTAMP},
+            #{item.reservedEndTime,jdbcType=TIMESTAMP},
+            #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.stopReasonCode,jdbcType=VARCHAR},
+            #{item.reason,jdbcType=VARCHAR},
+            #{item.settlementTime,jdbcType=TIMESTAMP}, #{item.refundAmount,jdbcType=DECIMAL},
+            #{item.refundStatus,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR},
+            #{item.createTime,jdbcType=TIMESTAMP},
+            #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR}
+            )
+        </foreach>
+    </insert>
+    <insert id="insertOrUpdate" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo"
+            useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into order_basic_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            order_code,
+            transaction_code,
+            order_status,
+            member_id,
+            station_id,
+            merchant_id,
+            pile_sn,
+            connector_code,
+            pile_connector_code,
+            logic_card,
+            vin_code,
+            start_mode,
+            third_party_type,
+            pay_mode,
+            pay_status,
+            pay_amount,
+            pay_time,
+            plate_number,
+            order_amount,
+            virtual_amount,
+            group_code,
+            discount_amount,
+            settle_amount,
+            remedial_amount,
+            charge_start_time,
+            charge_end_time,
+            start_type,
+            reserved_start_time,
+            reserved_end_time,
+            start_soc,
+            end_soc,
+            stop_reason_code,
+            reason,
+            settlement_time,
+            refund_amount,
+            refund_status,
+            create_by,
+            create_time,
+            update_by,
+            update_time,
+            del_flag,
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            #{orderCode,jdbcType=VARCHAR},
+            #{transactionCode,jdbcType=VARCHAR},
+            #{orderStatus,jdbcType=VARCHAR},
+            #{memberId,jdbcType=VARCHAR},
+            #{stationId,jdbcType=VARCHAR},
+            #{merchantId,jdbcType=VARCHAR},
+            #{pileSn,jdbcType=VARCHAR},
+            #{connectorCode,jdbcType=VARCHAR},
+            #{pileConnectorCode,jdbcType=VARCHAR},
+            #{logicCard,jdbcType=VARCHAR},
+            #{vinCode,jdbcType=VARCHAR},
+            #{startMode,jdbcType=VARCHAR},
+            #{thirdPartyType,jdbcType=VARCHAR},
+            #{payMode,jdbcType=VARCHAR},
+            #{payStatus,jdbcType=VARCHAR},
+            #{payAmount,jdbcType=DECIMAL},
+            #{payTime,jdbcType=TIMESTAMP},
+            #{plateNumber,jdbcType=VARCHAR},
+            #{orderAmount,jdbcType=DECIMAL},
+            #{virtualAmount,jdbcType=DECIMAL},
+            #{groupCode,jdbcType=VARCHAR},
+            #{discountAmount,jdbcType=DECIMAL},
+            #{settleAmount,jdbcType=DECIMAL},
+            #{remedialAmount,jdbcType=DECIMAL},
+            #{chargeStartTime,jdbcType=TIMESTAMP},
+            #{chargeEndTime,jdbcType=TIMESTAMP},
+            #{startType,jdbcType=VARCHAR},
+            #{reservedStartTime,jdbcType=TIMESTAMP},
+            #{reservedEndTime,jdbcType=TIMESTAMP},
+            #{startSoc,jdbcType=VARCHAR},
+            #{endSoc,jdbcType=VARCHAR},
+            #{stopReasonCode,jdbcType=VARCHAR},
+            #{reason,jdbcType=VARCHAR},
+            #{settlementTime,jdbcType=TIMESTAMP},
+            #{refundAmount,jdbcType=DECIMAL},
+            #{refundStatus,jdbcType=VARCHAR},
+            #{createBy,jdbcType=VARCHAR},
+            #{createTime,jdbcType=TIMESTAMP},
+            #{updateBy,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP},
+            #{delFlag,jdbcType=CHAR},
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            order_code = #{orderCode,jdbcType=VARCHAR},
+            transaction_code = #{transactionCode,jdbcType=VARCHAR},
+            order_status = #{orderStatus,jdbcType=VARCHAR},
+            member_id = #{memberId,jdbcType=VARCHAR},
+            station_id = #{stationId,jdbcType=VARCHAR},
+            merchant_id = #{merchantId,jdbcType=VARCHAR},
+            pile_sn = #{pileSn,jdbcType=VARCHAR},
+            connector_code = #{connectorCode,jdbcType=VARCHAR},
+            pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR},
+            logic_card = #{logicCard,jdbcType=VARCHAR},
+            vin_code = #{vinCode,jdbcType=VARCHAR},
+            start_mode = #{startMode,jdbcType=VARCHAR},
+            third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
+            pay_mode = #{payMode,jdbcType=VARCHAR},
+            pay_status = #{payStatus,jdbcType=VARCHAR},
+            pay_amount = #{payAmount,jdbcType=DECIMAL},
+            pay_time = #{payTime,jdbcType=TIMESTAMP},
+            plate_number = #{plateNumber,jdbcType=VARCHAR},
+            order_amount = #{orderAmount,jdbcType=DECIMAL},
+            virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
+            group_code = #{groupCode,jdbcType=VARCHAR},
+            discount_amount = #{discountAmount,jdbcType=DECIMAL},
+            settle_amount = #{settleAmount,jdbcType=DECIMAL},
+            remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
+            charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
+            charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
+            start_type = #{startType,jdbcType=VARCHAR},
+            reserved_start_time = #{reservedStartTime,jdbcType=TIMESTAMP},
+            reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
+            start_soc = #{startSoc,jdbcType=VARCHAR},
+            end_soc = #{endSoc,jdbcType=VARCHAR},
+            stop_reason_code = {stopReasonCode,jdbcType=VARCHAR},
+            reason = #{reason,jdbcType=VARCHAR},
+            settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
+            refund_amount = #{refundAmount,jdbcType=DECIMAL},
+            refund_status = #{refundStatus,jdbcType=VARCHAR},
+            create_by = #{createBy,jdbcType=VARCHAR},
+            create_time = #{createTime,jdbcType=TIMESTAMP},
+            update_by = #{updateBy,jdbcType=VARCHAR},
+            update_time = #{updateTime,jdbcType=TIMESTAMP},
+            del_flag = #{delFlag,jdbcType=CHAR},
+        </trim>
+    </insert>
+    <insert id="insertOrUpdateSelective" keyColumn="id" keyProperty="id"
+            parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
+        <!--@mbg.generated-->
+        insert into order_basic_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="orderCode != null">
+                order_code,
+            </if>
+            <if test="transactionCode != null">
+                transaction_code,
+            </if>
+            <if test="orderStatus != null">
+                order_status,
+            </if>
+            <if test="memberId != null">
+                member_id,
+            </if>
+            <if test="stationId != null">
+                station_id,
+            </if>
+            <if test="merchantId != null">
+                merchant_id,
+            </if>
+            <if test="pileSn != null">
+                pile_sn,
+            </if>
+            <if test="connectorCode != null">
+                connector_code,
+            </if>
+            <if test="pileConnectorCode != null">
+                pile_connector_code,
+            </if>
+            <if test="logicCard != null">
+                logic_card,
+            </if>
+            <if test="vinCode != null">
+                vin_code,
+            </if>
+            <if test="startMode != null">
+                start_mode,
+            </if>
+            <if test="thirdPartyType != null">
+                third_party_type,
+            </if>
+            <if test="payMode != null">
+                pay_mode,
+            </if>
+            <if test="payStatus != null">
+                pay_status,
+            </if>
+            <if test="payAmount != null">
+                pay_amount,
+            </if>
+            <if test="payTime != null">
+                pay_time,
+            </if>
+            <if test="plateNumber != null">
+                plate_number,
+            </if>
+            <if test="orderAmount != null">
+                order_amount,
+            </if>
+            <if test="virtualAmount != null">
+                virtual_amount,
+            </if>
+            <if test="groupCode != null">
+                group_code,
+            </if>
+            <if test="discountAmount != null">
+                discount_amount,
+            </if>
+            <if test="settleAmount != null">
+                settle_amount,
+            </if>
+            <if test="remedialAmount != null">
+                remedial_amount,
+            </if>
+            <if test="chargeStartTime != null">
+                charge_start_time,
+            </if>
+            <if test="chargeEndTime != null">
+                charge_end_time,
+            </if>
+            <if test="startType != null">
+                start_type,
+            </if>
+            <if test="reservedStartTime != null">
+                reserved_start_time,
+            </if>
+            <if test="reservedEndTime != null">
+                reserved_end_time,
+            </if>
+            <if test="startSoc != null">
+                start_soc,
+            </if>
+            <if test="endSoc != null">
+                end_soc,
+            </if>
+            <if test="stopReasonCode != null">
+                stop_reason_code,
+            </if>
+            <if test="reason != null">
+                reason,
+            </if>
+            <if test="settlementTime != null">
+                settlement_time,
+            </if>
+            <if test="refundAmount != null">
+                refund_amount,
+            </if>
+            <if test="refundStatus != null">
+                refund_status,
+            </if>
+            <if test="createBy != null">
+                create_by,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateBy != null">
+                update_by,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="delFlag != null">
+                del_flag,
+            </if>
+        </trim>
+        values
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="orderCode != null">
+                #{orderCode,jdbcType=VARCHAR},
+            </if>
+            <if test="transactionCode != null">
+                #{transactionCode,jdbcType=VARCHAR},
+            </if>
+            <if test="orderStatus != null">
+                #{orderStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="memberId != null">
+                #{memberId,jdbcType=VARCHAR},
+            </if>
+            <if test="stationId != null">
+                #{stationId,jdbcType=VARCHAR},
+            </if>
+            <if test="merchantId != null">
+                #{merchantId,jdbcType=VARCHAR},
+            </if>
+            <if test="pileSn != null">
+                #{pileSn,jdbcType=VARCHAR},
+            </if>
+            <if test="connectorCode != null">
+                #{connectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="pileConnectorCode != null">
+                #{pileConnectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="logicCard != null">
+                #{logicCard,jdbcType=VARCHAR},
+            </if>
+            <if test="vinCode != null">
+                #{vinCode,jdbcType=VARCHAR},
+            </if>
+            <if test="startMode != null">
+                #{startMode,jdbcType=VARCHAR},
+            </if>
+            <if test="thirdPartyType != null">
+                #{thirdPartyType,jdbcType=VARCHAR},
+            </if>
+            <if test="payMode != null">
+                #{payMode,jdbcType=VARCHAR},
+            </if>
+            <if test="payStatus != null">
+                #{payStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="payAmount != null">
+                #{payAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="payTime != null">
+                #{payTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="plateNumber != null">
+                #{plateNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="orderAmount != null">
+                #{orderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="virtualAmount != null">
+                #{virtualAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupCode != null">
+                #{groupCode,jdbcType=VARCHAR},
+            </if>
+            <if test="discountAmount != null">
+                #{discountAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="settleAmount != null">
+                #{settleAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="remedialAmount != null">
+                #{remedialAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="chargeStartTime != null">
+                #{chargeStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="chargeEndTime != null">
+                #{chargeEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="startType != null">
+                #{startType,jdbcType=VARCHAR},
+            </if>
+            <if test="reservedStartTime != null">
+                #{reservedStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="reservedEndTime != null">
+                #{reservedEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="startSoc != null">
+                #{startSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="endSoc != null">
+                #{endSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="stopReasonCode != null">
+                #{stopReasonCode,jdbcType=VARCHAR},
+            </if>
+            <if test="reason != null">
+                #{reason,jdbcType=VARCHAR},
+            </if>
+            <if test="settlementTime != null">
+                #{settlementTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="refundAmount != null">
+                #{refundAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="refundStatus != null">
+                #{refundStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy != null">
+                #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                #{delFlag,jdbcType=CHAR},
+            </if>
+        </trim>
+        on duplicate key update
+        <trim suffixOverrides=",">
+            <if test="id != null">
+                id = #{id,jdbcType=INTEGER},
+            </if>
+            <if test="orderCode != null">
+                order_code = #{orderCode,jdbcType=VARCHAR},
+            </if>
+            <if test="transactionCode != null">
+                transaction_code = #{transactionCode,jdbcType=VARCHAR},
+            </if>
+            <if test="orderStatus != null">
+                order_status = #{orderStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="memberId != null">
+                member_id = #{memberId,jdbcType=VARCHAR},
+            </if>
+            <if test="stationId != null">
+                station_id = #{stationId,jdbcType=VARCHAR},
+            </if>
+            <if test="merchantId != null">
+                merchant_id = #{merchantId,jdbcType=VARCHAR},
+            </if>
+            <if test="pileSn != null">
+                pile_sn = #{pileSn,jdbcType=VARCHAR},
+            </if>
+            <if test="connectorCode != null">
+                connector_code = #{connectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="pileConnectorCode != null">
+                pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR},
+            </if>
+            <if test="logicCard != null">
+                logic_card = #{logicCard,jdbcType=VARCHAR},
+            </if>
+            <if test="vinCode != null">
+                vin_code = #{vinCode,jdbcType=VARCHAR},
+            </if>
+            <if test="startMode != null">
+                start_mode = #{startMode,jdbcType=VARCHAR},
+            </if>
+            <if test="thirdPartyType != null">
+                third_party_type = #{thirdPartyType,jdbcType=VARCHAR},
+            </if>
+            <if test="payMode != null">
+                pay_mode = #{payMode,jdbcType=VARCHAR},
+            </if>
+            <if test="payStatus != null">
+                pay_status = #{payStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="payAmount != null">
+                pay_amount = #{payAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="payTime != null">
+                pay_time = #{payTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="plateNumber != null">
+                plate_number = #{plateNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="orderAmount != null">
+                order_amount = #{orderAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="virtualAmount != null">
+                virtual_amount = #{virtualAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="groupCode != null">
+                group_code = #{groupCode,jdbcType=VARCHAR},
+            </if>
+            <if test="discountAmount != null">
+                discount_amount = #{discountAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="settleAmount != null">
+                settle_amount = #{settleAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="remedialAmount != null">
+                remedial_amount = #{remedialAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="chargeStartTime != null">
+                charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="chargeEndTime != null">
+                charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="startType != null">
+                start_type = #{startType,jdbcType=VARCHAR},
+            </if>
+            <if test="reservedStartTime != null">
+                reserved_start_time = #{reservedStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="reservedEndTime != null">
+                reserved_end_time = #{reservedEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="startSoc != null">
+                start_soc = #{startSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="endSoc != null">
+                end_soc = #{endSoc,jdbcType=VARCHAR},
+            </if>
+            <if test="stopReasonCode != null">
+                stop_reason_code = #{stopReasonCode,jdbcType=VARCHAR},
+            </if>
+            <if test="reason != null">
+                reason = #{reason,jdbcType=VARCHAR},
+            </if>
+            <if test="settlementTime != null">
+                settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="refundAmount != null">
+                refund_amount = #{refundAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="refundStatus != null">
+                refund_status = #{refundStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy != null">
+                create_by = #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null">
+                update_by = #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                update_time = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="delFlag != null">
+                del_flag = #{delFlag,jdbcType=CHAR},
+            </if>
+        </trim>
+    </insert>
 
-    <resultMap extends="BaseResultMap" id="OrderBasicInfoOrderDetailResult" type="com.jsowell.pile.domain.OrderBasicInfo">
-        <collection javaType="java.util.List" notNullColumn="sub_id" property="orderDetailList" resultMap="OrderDetailResult" />
+    <resultMap extends="BaseResultMap" id="OrderBasicInfoOrderDetailResult"
+               type="com.jsowell.pile.domain.OrderBasicInfo">
+        <collection javaType="java.util.List" notNullColumn="sub_id" property="orderDetailList"
+                    resultMap="OrderDetailResult"/>
     </resultMap>
 
     <resultMap id="OrderDetailResult" type="com.jsowell.pile.domain.OrderDetail">
-        <result column="id" property="id" />
-        <result column="order_code" property="orderCode" />
-        <result column="total_used_electricity" property="totalUsedElectricity" />
-        <result column="total_order_amount" property="totalOrderAmount" />
-        <result column="total_electricity_amount" property="totalElectricityAmount" />
-        <result column="total_service_amount" property="totalServiceAmount" />
-        <result column="sharp_price" property="sharpPrice" />
-        <result column="sharp_used_electricity" property="sharpUsedElectricity" />
-        <result column="sharp_electricity_price" property="sharpElectricityPrice" />
-        <result column="sharp_service_price" property="sharpServicePrice" />
-        <result column="sharp_amount" property="sharpAmount" />
-        <result column="peak_price" property="peakPrice" />
-        <result column="peak_used_electricity" property="peakUsedElectricity" />
-        <result column="peak_electricity_price" property="peakElectricityPrice" />
-        <result column="peak_service_price" property="peakServicePrice" />
-        <result column="peak_amount" property="peakAmount" />
-        <result column="flat_price" property="flatPrice" />
-        <result column="flat_used_electricity" property="flatUsedElectricity" />
-        <result column="flat_electricity_price" property="flatElectricityPrice" />
-        <result column="flat_service_price" property="flatServicePrice" />
-        <result column="flat_amount" property="flatAmount" />
-        <result column="valley_price" property="valleyPrice" />
-        <result column="valley_used_electricity" property="valleyUsedElectricity" />
-        <result column="valley_electricity_price" property="valleyElectricityPrice" />
-        <result column="valley_service_price" property="valleyServicePrice" />
-        <result column="valley_amount" property="valleyAmount" />
-        <result column="create_by" property="createBy" />
-        <result column="create_time" property="createTime" />
-        <result column="update_by" property="updateBy" />
-        <result column="update_time" property="updateTime" />
-        <result column="del_flag" property="delFlag" />
+        <result column="id" property="id"/>
+        <result column="order_code" property="orderCode"/>
+        <result column="total_used_electricity" property="totalUsedElectricity"/>
+        <result column="total_order_amount" property="totalOrderAmount"/>
+        <result column="total_electricity_amount" property="totalElectricityAmount"/>
+        <result column="total_service_amount" property="totalServiceAmount"/>
+        <result column="sharp_price" property="sharpPrice"/>
+        <result column="sharp_used_electricity" property="sharpUsedElectricity"/>
+        <result column="sharp_electricity_price" property="sharpElectricityPrice"/>
+        <result column="sharp_service_price" property="sharpServicePrice"/>
+        <result column="sharp_amount" property="sharpAmount"/>
+        <result column="peak_price" property="peakPrice"/>
+        <result column="peak_used_electricity" property="peakUsedElectricity"/>
+        <result column="peak_electricity_price" property="peakElectricityPrice"/>
+        <result column="peak_service_price" property="peakServicePrice"/>
+        <result column="peak_amount" property="peakAmount"/>
+        <result column="flat_price" property="flatPrice"/>
+        <result column="flat_used_electricity" property="flatUsedElectricity"/>
+        <result column="flat_electricity_price" property="flatElectricityPrice"/>
+        <result column="flat_service_price" property="flatServicePrice"/>
+        <result column="flat_amount" property="flatAmount"/>
+        <result column="valley_price" property="valleyPrice"/>
+        <result column="valley_used_electricity" property="valleyUsedElectricity"/>
+        <result column="valley_electricity_price" property="valleyElectricityPrice"/>
+        <result column="valley_service_price" property="valleyServicePrice"/>
+        <result column="valley_amount" property="valleyAmount"/>
+        <result column="create_by" property="createBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="del_flag" property="delFlag"/>
     </resultMap>
 
     <sql id="selectOrderBasicInfoVo">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
     </sql>
 
@@ -1686,114 +1702,115 @@
         del_flag
     </sql>
 
-  <select id="selectOrderBasicInfoList" parameterType="com.jsowell.pile.dto.QueryOrderDTO"
-          resultType="com.jsowell.pile.vo.web.OrderListVO">
-    SELECT t1.id                       as id,
-           t1.order_code               as orderCode,
-           t1.transaction_code         as transactionCode,
-           t1.order_status             as orderStatus,
-           t1.member_id                as memberId,
-           t2.nick_name                as nickName,
-           t2.mobile_number            as mobileNumber,
-           t1.station_id               as stationId,
-           t3.station_name             as stationName,
-           t1.pile_sn                  as pileSn,
-           t1.connector_code           as connectorCode,
-           t1.logic_card               as logicCard,
-           t1.vin_code                 as vinCode,
-           t1.plate_number             as plateNumber,
-           t1.start_mode               as startMode,
-           t1.third_party_type         as thirdPartyType,
-           t1.pay_mode                 as payMode,
-           t1.pay_status               as payStatus,
-           t1.pay_amount               as payAmount,
-           t1.pay_time                 as payTime,
-            t1.reason                  as reason,
-           t1.order_amount             as orderAmount,
-           t1.virtual_amount           as virtualAmount,
-           t1.discount_amount          as discountAmount,
-           t1.settle_amount            as settleAmount,
-           t1.settlement_time          as settlementTime,
-           t1.start_soc                as startSoc,
-           t1.end_soc                  as endSoc,
-           t1.charge_start_time        as chargeStartTime,
-           t1.charge_end_time          as chargeEndTime,
-           t1.create_time              as createTime,
-           t4.total_used_electricity   as chargingDegree,
-           t4.total_electricity_amount as totalElectricityAmount,
-           t4.total_service_amount     as totalServiceAmount,
-           t4.sharp_used_electricity   as sharpElectricity,
-           t4.peak_used_electricity    as peakElectricity,
-           t4.flat_used_electricity    as flatElectricity,
-           t4.valley_used_electricity  as valleyElectricity
-    from order_basic_info t1
-           left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
-           join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
-           join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
-    where t1.del_flag = '0'
-    <if test="pileSn != null and pileSn != ''">
-      and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}
-    </if>
-    <if test="connectorCode != null and connectorCode != ''">
-      and t1.connector_code = #{connectorCode,jdbcType=VARCHAR}
-    </if>
-    <if test="memberId != null and memberId != ''">
-      and t1.member_id = #{memberId,jdbcType=VARCHAR}
-    </if>
-    <if test="orderStatus != null and orderStatus != ''">
-      and t1.order_status = #{orderStatus,jdbcType=VARCHAR}
-    </if>
-    <if test="orderCode != null and orderCode != ''">
-      and t1.order_code = #{orderCode,jdbcType=VARCHAR}
-    </if>
-    <if test="transactionCode != null and transactionCode != ''">
-      and t1.transaction_code = #{transactionCode,jdbcType=VARCHAR}
-    </if>
-    <if test="mobileNumber != null and mobileNumber != ''">
-      and t2.mobile_number = #{mobileNumber,jdbcType=VARCHAR}
-    </if>
-    <if test="merchantId != null and merchantId != ''">
-      and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
-    </if>
-    <if test="stationId != null and stationId != ''">
-      and t1.station_id = #{stationId,jdbcType=VARCHAR}
-    </if>
-    <if test="startTime != null and startTime != ''">
-      and t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
-    </if>
-    <if test="endTime != null and endTime != ''">
-      and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
-    </if>
-    <if test="startSettleTime != null and startSettleTime != ''">
-      and t1.settlement_time <![CDATA[ >= ]]> #{startSettleTime,jdbcType=VARCHAR}
-    </if>
-    <if test="endSettleTime != null and endSettleTime != ''">
-      and t1.settlement_time <![CDATA[ <= ]]> #{endSettleTime,jdbcType=VARCHAR}
-    </if>
-    <if test="groupCode != null and groupCode != ''">
-      and t1.group_code = #{groupCode,jdbcType=VARCHAR}
-    </if>
-    <if test="vinCode != null and vinCode != ''">
-      and t1.vin_code = #{vinCode,jdbcType=VARCHAR}
-    </if>
-    <if test="stationDeptIds != null and stationDeptIds.size() != 0">
-      and t3.dept_id in
-      <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">
-        #{stationDeptId}
-      </foreach>
-    </if>
-    order by t1.create_time desc
-  </select>
+    <select id="selectOrderBasicInfoList" parameterType="com.jsowell.pile.dto.QueryOrderDTO"
+            resultType="com.jsowell.pile.vo.web.OrderListVO">
+        SELECT t1.id as id,
+        t1.order_code as orderCode,
+        t1.transaction_code as transactionCode,
+        t1.order_status as orderStatus,
+        t1.member_id as memberId,
+        t2.nick_name as nickName,
+        t2.mobile_number as mobileNumber,
+        t1.station_id as stationId,
+        t3.station_name as stationName,
+        t1.pile_sn as pileSn,
+        t1.connector_code as connectorCode,
+        t1.logic_card as logicCard,
+        t1.vin_code as vinCode,
+        t1.plate_number as plateNumber,
+        t1.start_mode as startMode,
+        t1.third_party_type as thirdPartyType,
+        t1.pay_mode as payMode,
+        t1.pay_status as payStatus,
+        t1.pay_amount as payAmount,
+        t1.pay_time as payTime,
+        t1.reason as reason,
+        t1.order_amount as orderAmount,
+        t1.virtual_amount as virtualAmount,
+        t1.discount_amount as discountAmount,
+        t1.settle_amount as settleAmount,
+        t1.settlement_time as settlementTime,
+        t1.start_soc as startSoc,
+        t1.end_soc as endSoc,
+        t1.charge_start_time as chargeStartTime,
+        t1.charge_end_time as chargeEndTime,
+        t1.create_time as createTime,
+        t4.total_used_electricity as chargingDegree,
+        t4.total_electricity_amount as totalElectricityAmount,
+        t4.total_service_amount as totalServiceAmount,
+        t4.sharp_used_electricity as sharpElectricity,
+        t4.peak_used_electricity as peakElectricity,
+        t4.flat_used_electricity as flatElectricity,
+        t4.valley_used_electricity as valleyElectricity
+        from order_basic_info t1
+        left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
+        join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
+        join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
+        where t1.del_flag = '0'
+        <if test="pileSn != null and pileSn != ''">
+            and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}
+        </if>
+        <if test="connectorCode != null and connectorCode != ''">
+            and t1.connector_code = #{connectorCode,jdbcType=VARCHAR}
+        </if>
+        <if test="memberId != null and memberId != ''">
+            and t1.member_id = #{memberId,jdbcType=VARCHAR}
+        </if>
+        <if test="orderStatus != null and orderStatus != ''">
+            and t1.order_status = #{orderStatus,jdbcType=VARCHAR}
+        </if>
+        <if test="orderCode != null and orderCode != ''">
+            and t1.order_code = #{orderCode,jdbcType=VARCHAR}
+        </if>
+        <if test="transactionCode != null and transactionCode != ''">
+            and t1.transaction_code = #{transactionCode,jdbcType=VARCHAR}
+        </if>
+        <if test="mobileNumber != null and mobileNumber != ''">
+            and t2.mobile_number = #{mobileNumber,jdbcType=VARCHAR}
+        </if>
+        <if test="merchantId != null and merchantId != ''">
+            and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
+        </if>
+        <if test="stationId != null and stationId != ''">
+            and t1.station_id = #{stationId,jdbcType=VARCHAR}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            and t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+        </if>
+        <if test="startSettleTime != null and startSettleTime != ''">
+            and t1.settlement_time <![CDATA[ >= ]]> #{startSettleTime,jdbcType=VARCHAR}
+        </if>
+        <if test="endSettleTime != null and endSettleTime != ''">
+            and t1.settlement_time <![CDATA[ <= ]]> #{endSettleTime,jdbcType=VARCHAR}
+        </if>
+        <if test="groupCode != null and groupCode != ''">
+            and t1.group_code = #{groupCode,jdbcType=VARCHAR}
+        </if>
+        <if test="vinCode != null and vinCode != ''">
+            and t1.vin_code = #{vinCode,jdbcType=VARCHAR}
+        </if>
+        <if test="stationDeptIds != null and stationDeptIds.size() != 0">
+            and t3.dept_id in
+            <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">
+                #{stationDeptId}
+            </foreach>
+        </if>
+        order by t1.create_time desc
+    </select>
 
-    <select id="getOrderTotalData" parameterType="com.jsowell.pile.dto.QueryOrderDTO" resultType="com.jsowell.pile.vo.web.OrderTotalDataVO">
+    <select id="getOrderTotalData" parameterType="com.jsowell.pile.dto.QueryOrderDTO"
+            resultType="com.jsowell.pile.vo.web.OrderTotalDataVO">
         select
         IFNULL(sum(t1.order_amount),0) as sumOrderAmount,
         IFNULL(sum(t4.total_used_electricity),0) as sumUsedElectricity,
         IFNULL(sum(t1.settle_amount),0) as sumSettleAmount
         from order_basic_info t1
-         left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
-         join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
-         join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
+        left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
+        join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
+        join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
         where t1.del_flag = '0'
         <if test="pileSn != null and pileSn != ''">
             and t1.pile_sn = #{pileSn,jdbcType=VARCHAR}
@@ -1834,12 +1851,12 @@
         <if test="merchantId != null and merchantId != ''">
             and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
         </if>
-      <if test="stationIdList != null and stationIdList.size() != 0">
-        and t1.station_id in
-        <foreach collection="stationIdList" item="stationId" open="(" separator="," close=")">
-          #{stationId}
-        </foreach>
-      </if>
+        <if test="stationIdList != null and stationIdList.size() != 0">
+            and t1.station_id in
+            <foreach collection="stationIdList" item="stationId" open="(" separator="," close=")">
+                #{stationId}
+            </foreach>
+        </if>
         <if test="stationDeptIds != null and stationDeptIds.size() != 0">
             and t3.dept_id in
             <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">
@@ -1897,7 +1914,8 @@
         where a.id = #{id}
     </select>
 
-    <insert id="insertOrderBasicInfo" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo" useGeneratedKeys="true">
+    <insert id="insertOrderBasicInfo" keyProperty="id" parameterType="com.jsowell.pile.domain.OrderBasicInfo"
+            useGeneratedKeys="true">
         insert into order_basic_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="orderCode != null">
@@ -1984,9 +2002,9 @@
             <if test="endSoc != null">
                 end_soc,
             </if>
-          <if test="stopReasonCode != null">
-            stop_reason_code,
-          </if>
+            <if test="stopReasonCode != null">
+                stop_reason_code,
+            </if>
             <if test="reason != null">
                 reason,
             </if>
@@ -2050,7 +2068,7 @@
                 #{startMode},
             </if>
             <if test="thirdPartyType != null">
-                 #{thirdPartyType},
+                #{thirdPartyType},
             </if>
             <if test="payMode != null">
                 #{payMode},
@@ -2092,14 +2110,14 @@
                 #{reservedEndTime},
             </if>
             <if test="startSoc != null">
-              #{startSoc},
+                #{startSoc},
             </if>
             <if test="endSoc != null">
-              #{endSoc},
+                #{endSoc},
+            </if>
+            <if test="stopReasonCode != null">
+                #{stopReasonCode},
             </if>
-          <if test="stopReasonCode != null">
-            #{stopReasonCode},
-          </if>
             <if test="reason != null">
                 #{reason},
             </if>
@@ -2163,9 +2181,9 @@
             <if test="startMode != null">
                 start_mode = #{startMode},
             </if>
-          <if test="thirdPartyType != null">
-            third_party_type = #{thirdPartyType},
-          </if>
+            <if test="thirdPartyType != null">
+                third_party_type = #{thirdPartyType},
+            </if>
             <if test="payMode != null">
                 pay_mode = #{payMode},
             </if>
@@ -2187,12 +2205,12 @@
             <if test="virtualAmount != null">
                 virtual_amount = #{virtualAmount},
             </if>
-          <if test="groupCode != null">
-            group_code = #{groupCode},
-          </if>
-          <if test="discountAmount != null">
-            discount_amount = #{discountAmount},
-          </if>
+            <if test="groupCode != null">
+                group_code = #{groupCode},
+            </if>
+            <if test="discountAmount != null">
+                discount_amount = #{discountAmount},
+            </if>
             <if test="settleAmount != null">
                 settle_amount = #{settleAmount},
             </if>
@@ -2206,14 +2224,14 @@
                 start_type = #{startType},
             </if>
             <if test="startSoc != null">
-              start_soc = #{startSoc},
+                start_soc = #{startSoc},
             </if>
             <if test="endSoc != null">
-              end_soc = #{endSoc},
+                end_soc = #{endSoc},
+            </if>
+            <if test="stopReasonCode != null">
+                stop_reason_code = #{stopReasonCode},
             </if>
-          <if test="stopReasonCode != null">
-            stop_reason_code = #{stopReasonCode},
-          </if>
             <if test="reason != null">
                 reason = #{reason},
             </if>
@@ -2266,29 +2284,29 @@
 
     <insert id="batchOrderDetail">
         insert into order_detail(id, order_code, total_used_electricity, total_order_amount, total_electricity_amount,
-                                 total_service_amount,
-                                 sharp_price, sharp_used_electricity, sharp_electricity_price, sharp_service_price,
-                                 sharp_amount,
-                                 peak_price, peak_used_electricity, peak_electricity_price, peak_service_price,
-                                 peak_amount,
-                                 flat_price, flat_used_electricity, flat_electricity_price, flat_service_price,
-                                 flat_amount,
-                                 valley_price, valley_used_electricity, valley_electricity_price, valley_service_price,
-                                 valley_amount,
-                                 create_by, update_by)
+        total_service_amount,
+        sharp_price, sharp_used_electricity, sharp_electricity_price, sharp_service_price,
+        sharp_amount,
+        peak_price, peak_used_electricity, peak_electricity_price, peak_service_price,
+        peak_amount,
+        flat_price, flat_used_electricity, flat_electricity_price, flat_service_price,
+        flat_amount,
+        valley_price, valley_used_electricity, valley_electricity_price, valley_service_price,
+        valley_amount,
+        create_by, update_by)
         values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.id}, #{item.orderCode}, #{item.totalUsedElectricity}, #{item.totalOrderAmount},
-             #{item.totalElectricityAmount}, #{item.totalServiceAmount},
-             #{item.sharpPrice}, #{item.sharpUsedElectricity}, #{item.sharpElectricityPrice}, #{item.sharpServicePrice},
-             #{item.sharpAmount},
-             #{item.peakPrice}, #{item.peakUsedElectricity}, #{item.peakElectricityPrice}, #{item.peakServicePrice},
-             #{item.peakAmount},
-             #{item.flatPrice}, #{item.flatUsedElectricity}, #{item.flatElectricityPrice}, #{item.flatServicePrice},
-             #{item.flatAmount},
-             #{item.valleyPrice}, #{item.valleyUsedElectricity}, #{item.valleyElectricityPrice},
-             #{item.valleyServicePrice}, #{item.valleyAmount},
-             #{item.createBy}, #{item.updateBy})
+            #{item.totalElectricityAmount}, #{item.totalServiceAmount},
+            #{item.sharpPrice}, #{item.sharpUsedElectricity}, #{item.sharpElectricityPrice}, #{item.sharpServicePrice},
+            #{item.sharpAmount},
+            #{item.peakPrice}, #{item.peakUsedElectricity}, #{item.peakElectricityPrice}, #{item.peakServicePrice},
+            #{item.peakAmount},
+            #{item.flatPrice}, #{item.flatUsedElectricity}, #{item.flatElectricityPrice}, #{item.flatServicePrice},
+            #{item.flatAmount},
+            #{item.valleyPrice}, #{item.valleyUsedElectricity}, #{item.valleyElectricityPrice},
+            #{item.valleyServicePrice}, #{item.valleyAmount},
+            #{item.createBy}, #{item.updateBy})
         </foreach>
     </insert>
 
@@ -2307,15 +2325,15 @@
             <if test="totalElectricityAmount != null">
                 total_electricity_amount = #{totalElectricityAmount},
             </if>
-          <if test="discountElectricityAmount != null">
-            discount_electricity_amount = #{discountElectricityAmount},
-          </if>
+            <if test="discountElectricityAmount != null">
+                discount_electricity_amount = #{discountElectricityAmount},
+            </if>
             <if test="totalServiceAmount != null">
                 total_service_amount = #{totalServiceAmount},
             </if>
-          <if test="discountServiceAmount != null">
-            discount_service_amount = #{discountServiceAmount},
-          </if>
+            <if test="discountServiceAmount != null">
+                discount_service_amount = #{discountServiceAmount},
+            </if>
             <if test="sharpPrice != null">
                 sharp_price = #{sharpPrice},
             </if>
@@ -2392,7 +2410,7 @@
 
     <select id="getOrderInfoByOrderCode" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         <where>
             order_code = #{orderCode,jdbcType=VARCHAR}
@@ -2402,59 +2420,59 @@
 
     <select id="getOrderInfoByTransactionCode" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         where del_flag = '0'
-          and transaction_code = #{transactionCode,jdbcType=VARCHAR}
+        and transaction_code = #{transactionCode,jdbcType=VARCHAR}
     </select>
 
     <select id="queryOrderBasicInfo" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         where del_flag = '0'
-          and pile_sn = #{pileSn,jdbcType=VARCHAR}
-          and connector_code = #{connectorCode,jdbcType=VARCHAR}
-          and order_status = #{orderStatus,jdbcType=VARCHAR}
+        and pile_sn = #{pileSn,jdbcType=VARCHAR}
+        and connector_code = #{connectorCode,jdbcType=VARCHAR}
+        and order_status = #{orderStatus,jdbcType=VARCHAR}
         order by create_time DESC
         limit 1
     </select>
 
     <select id="getOrderDetailByOrderCode" resultMap="OrderDetailResult">
         select
-        <include refid="Detail_Base_Column_List" />
+        <include refid="Detail_Base_Column_List"/>
         from order_detail
         where del_flag = '0'
-          and order_code = #{orderCode,jdbcType=VARCHAR}
+        and order_code = #{orderCode,jdbcType=VARCHAR}
     </select>
 
     <select id="getListByMemberIdAndOrderStatus" resultType="com.jsowell.pile.vo.uniapp.customer.OrderVO">
         SELECT t1.id,
-               t1.order_code               as orderCode,
-                t1.transaction_code as transactionCode,
-               t1.order_status             as orderStatus,
-                t1.stop_reason_code as stopReasonCode,
-               t1.reason,
-               t1.station_id               as stationId,
-               t3.station_name             as stationName,
-               t1.pile_sn                  as pileSn,
-               t1.connector_code           as connectorCode,
-               t1.pay_status               as payStatus,
-               t1.start_mode               as startMode,
-               t1.order_amount             as orderAmount,
-               t1.virtual_amount           as virtualAmount,
-               t1.settle_amount            as settleAmount,
-               t1.pay_amount               as payAmount,
-               t2.total_used_electricity   as chargingDegree,
-               t1.charge_start_time        as startTime,
-               t1.charge_end_time          as endTime,
-               t2.total_electricity_amount as totalElectricityAmount,
-               t2.total_service_amount     as totalServiceAmount
+        t1.order_code as orderCode,
+        t1.transaction_code as transactionCode,
+        t1.order_status as orderStatus,
+        t1.stop_reason_code as stopReasonCode,
+        t1.reason,
+        t1.station_id as stationId,
+        t3.station_name as stationName,
+        t1.pile_sn as pileSn,
+        t1.connector_code as connectorCode,
+        t1.pay_status as payStatus,
+        t1.start_mode as startMode,
+        t1.order_amount as orderAmount,
+        t1.virtual_amount as virtualAmount,
+        t1.settle_amount as settleAmount,
+        t1.pay_amount as payAmount,
+        t2.total_used_electricity as chargingDegree,
+        t1.charge_start_time as startTime,
+        t1.charge_end_time as endTime,
+        t2.total_electricity_amount as totalElectricityAmount,
+        t2.total_service_amount as totalServiceAmount
         from order_basic_info t1
-                 join order_detail t2 on t1.order_code = t2.order_code
-                 join pile_station_info t3 on t1.station_id = t3.id
+        join order_detail t2 on t1.order_code = t2.order_code
+        join pile_station_info t3 on t1.station_id = t3.id
         where t1.del_flag = '0'
-          and t1.member_id = #{memberId,jdbcType=VARCHAR}
+        and t1.member_id = #{memberId,jdbcType=VARCHAR}
         <if test="stationId != null and stationId != ''">
             and t1.station_id = #{stationId,jdbcType=VARCHAR}
         </if>
@@ -2479,17 +2497,17 @@
 
     <select id="getIndexOrderInfo" resultType="com.jsowell.pile.vo.web.IndexOrderInfoVO">
         SELECT DATE_FORMAT(t1.create_time, '%Y-%m-%d') as date,
-               sum(t2.total_used_electricity)          AS totalElectricity,
-               sum(t2.total_order_amount)              AS totalOrderAmount,
-               sum(t2.sharp_used_electricity)          AS totalSharpUsedElectricity,
-               sum(t2.peak_used_electricity)           AS totalPeakUsedElectricity,
-               sum(t2.flat_used_electricity)           AS totalFlatUsedElectricity,
-               sum(t2.valley_used_electricity)         AS totalValleyUsedElectricity
+        sum(t2.total_used_electricity) AS totalElectricity,
+        sum(t2.total_order_amount) AS totalOrderAmount,
+        sum(t2.sharp_used_electricity) AS totalSharpUsedElectricity,
+        sum(t2.peak_used_electricity) AS totalPeakUsedElectricity,
+        sum(t2.flat_used_electricity) AS totalFlatUsedElectricity,
+        sum(t2.valley_used_electricity) AS totalValleyUsedElectricity
         FROM order_basic_info t1
-                 JOIN order_detail t2 ON t1.order_code = t2.order_code
-            AND t1.del_flag = '0'
+        JOIN order_detail t2 ON t1.order_code = t2.order_code
+        AND t1.del_flag = '0'
         WHERE date(t1.create_time) &gt;= DATE_SUB(CURDATE(), INTERVAL 30 day)
-          and t1.order_status = '6'
+        and t1.order_status = '6'
         <if test="dto.stationId != null and dto.stationId != ''">
             and t1.station_id = #{dto.stationId,jdbcType=VARCHAR}
         </if>
@@ -2504,28 +2522,29 @@
 
     <select id="getUnpaidOrderListOver15Min" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         where del_flag = '0'
-          and order_status = '0'
-          and pay_status = '0'
-          <!--and create_time <![CDATA[ <= ]]> #{createTime,jdbcType=VARCHAR}-->
-      and create_time between date_sub(#{createTime,jdbcType=VARCHAR}, interval 15 minute) and  #{createTime,jdbcType=VARCHAR}
+        and order_status = '0'
+        and pay_status = '0'
+        <!--and create_time <![CDATA[ <= ]]> #{createTime,jdbcType=VARCHAR}-->
+        and create_time between date_sub(#{createTime,jdbcType=VARCHAR}, interval 15 minute) and
+        #{createTime,jdbcType=VARCHAR}
     </select>
 
     <select id="getUnpaidOrderList" resultMap="BaseResultMap">
-      select
-      <include refid="Base_Column_List" />
-      from order_basic_info
-      where del_flag = '0'
-      and order_status = '0'
-      and pay_status = '0'
-      and create_time between #{startTime,jdbcType=VARCHAR}  and #{endTime,jdbcType=VARCHAR}
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where del_flag = '0'
+        and order_status = '0'
+        and pay_status = '0'
+        and create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
     </select>
 
     <select id="selectOrderListByTimeRangeAndStatus" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         where del_flag = '0'
         and start_mode != '4'
@@ -2547,7 +2566,7 @@
         update order_basic_info
         set order_status = #{orderStatus,jdbcType=VARCHAR}
         where del_flag = '0'
-          and id in
+        and id in
         <foreach close=")" collection="orderIds" item="orderId" open="(" separator=",">
             #{orderId,jdbcType=VARCHAR}
         </foreach>
@@ -2563,22 +2582,22 @@
                t1.station_id             as stationId,
                t2.station_name           as stationName,
                t3.total_order_amount     as orderAmount,
-                t1.order_amount as orderAmount,
-                t1.discount_amount as discountAmount,
-                t1.settle_amount as settleAmount,
+               t1.order_amount           as orderAmount,
+               t1.discount_amount        as discountAmount,
+               t1.settle_amount          as settleAmount,
                t3.total_used_electricity as chargingDegree,
                t4.open_id                as openId
         FROM order_basic_info t1
-       JOIN pile_station_info t2 ON t1.station_id = t2.id and t1.del_flag = '0'
-       join order_detail t3 on t1.order_code = t3.order_code and t3.del_flag = '0'
-       join member_basic_info t4 on t1.member_id = t4.member_id and t4.del_flag = '0'
+                 JOIN pile_station_info t2 ON t1.station_id = t2.id and t1.del_flag = '0'
+                 join order_detail t3 on t1.order_code = t3.order_code and t3.del_flag = '0'
+                 join member_basic_info t4 on t1.member_id = t4.member_id and t4.del_flag = '0'
         where t1.del_flag = '0'
-            and t1.order_code = #{orderCode,jdbcType=VARCHAR}
+          and t1.order_code = #{orderCode,jdbcType=VARCHAR}
     </select>
 
     <select id="getOrderBasicInfo" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         where del_flag = '0'
         <if test="memberId != null and memberId != ''">
@@ -2598,45 +2617,45 @@
     </select>
 
     <select id="getAccumulativeInfo" resultType="com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO">
-        SELECT t1.member_id              as memberId,
-               t1.pile_connector_code    as pileConnectorCode,
-               t1.pile_sn                as pileSn,
-               t1.charge_start_time      as chargeStartTime,
-               t1.charge_end_time        as chargeEndTime,
-               t2.total_used_electricity as sumChargingDegree
+        SELECT t1.member_id as memberId,
+        t1.pile_connector_code as pileConnectorCode,
+        t1.pile_sn as pileSn,
+        t1.charge_start_time as chargeStartTime,
+        t1.charge_end_time as chargeEndTime,
+        t2.total_used_electricity as sumChargingDegree
         FROM order_basic_info t1
         JOIN order_detail t2 ON t1.order_code = t2.order_code
         WHERE t1.pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}
-          <!--AND t1.member_id = #{memberId,jdbcType=VARCHAR}-->
-          AND t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
-          AND t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
-          <!--AND t1.order_status = '6'-->
-          AND t1.del_flag = '0'
+        <!--AND t1.member_id = #{memberId,jdbcType=VARCHAR}-->
+        AND t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
+        AND t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+        <!--AND t1.order_status = '6'-->
+        AND t1.del_flag = '0'
         order by t1.create_time desc
     </select>
 
     <select id="getListByOrderCodes" resultType="com.jsowell.pile.vo.uniapp.customer.OrderVO">
-        SELECT t1.order_code               as orderCode,
-               t1.order_status             as orderStatus,
-               t1.reason                   as reason,
-               t1.merchant_id              as merchantId,
-               t1.station_id               as stationId,
-               t3.station_name             as stationName,
-               t1.pile_sn                  as pileSn,
-               t1.connector_code           as connectorCode,
-               t1.pay_status               as payStatus,
-               t1.order_amount             as orderAmount,
-               t1.pay_amount               as payAmount,
-               t2.total_used_electricity   as chargingDegree,
-               t1.charge_start_time        as startTime,
-               t1.charge_end_time          as endTime,
-               t2.total_electricity_amount as totalElectricityAmount,
-               t2.total_service_amount     as totalServiceAmount
+        SELECT t1.order_code as orderCode,
+        t1.order_status as orderStatus,
+        t1.reason as reason,
+        t1.merchant_id as merchantId,
+        t1.station_id as stationId,
+        t3.station_name as stationName,
+        t1.pile_sn as pileSn,
+        t1.connector_code as connectorCode,
+        t1.pay_status as payStatus,
+        t1.order_amount as orderAmount,
+        t1.pay_amount as payAmount,
+        t2.total_used_electricity as chargingDegree,
+        t1.charge_start_time as startTime,
+        t1.charge_end_time as endTime,
+        t2.total_electricity_amount as totalElectricityAmount,
+        t2.total_service_amount as totalServiceAmount
         from order_basic_info t1
         join order_detail t2 on t1.order_code = t2.order_code
         join pile_station_info t3 on t1.station_id = t3.id
         where t1.del_flag = '0'
-          and t1.order_code in
+        and t1.order_code in
         <foreach close=")" collection="orderCodes" item="orderCode" open="(" separator=",">
             #{orderCode,jdbcType=VARCHAR}
         </foreach>
@@ -2647,6 +2666,8 @@
                t1.pile_connector_code                  as pileConnectorCode,
                t1.pile_sn                              as pileSn,
                t1.station_id                           as stationId,
+               t1.charge_start_time                    as startTime,
+               t1.charge_end_time                      as endTime,
                IFNULL(t2.total_used_electricity, 0.00) as connectorElectricity
         FROM order_basic_info t1
                  JOIN order_detail t2 ON t1.order_code = t2.order_code
@@ -2658,12 +2679,12 @@
 
     <select id="queryElecAmountNullList" resultMap="OrderDetailResult">
         select
-        <include refid="Detail_Base_Column_List" />
+        <include refid="Detail_Base_Column_List"/>
         from order_detail
         where del_flag = '0'
-          and total_order_amount is not null
-          AND total_order_amount &gt; '0.00'
-          and total_electricity_amount is null
+        and total_order_amount is not null
+        AND total_order_amount &gt; '0.00'
+        and total_electricity_amount is null
     </select>
 
     <update id="batchUpdateOrderDetail">
@@ -2692,36 +2713,36 @@
 
     <select id="getOrderDetailList" resultMap="OrderDetailResult">
         select
-        <include refid="Detail_Base_Column_List" />
+        <include refid="Detail_Base_Column_List"/>
         from order_detail
         where del_flag = '0'
-          and order_code in
+        and order_code in
         <foreach close=")" collection="list" item="item" open="(" separator=",">
             #{item,jdbcType=VARCHAR}
         </foreach>
     </select>
     <select id="tempQueryWeChatRefundOrders" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         where del_flag = '0'
-          and pay_mode = '4'
-          and refund_amount &gt; '0.00'
-          and create_time BETWEEN #{startTime} and #{endTime}
+        and pay_mode = '4'
+        and refund_amount &gt; '0.00'
+        and create_time BETWEEN #{startTime} and #{endTime}
     </select>
 
     <select id="getMerchantOrderInfoList" resultType="com.jsowell.pile.vo.base.MerchantOrderInfoVO">
-        select t1.order_code       as orderCode,
-               t1.transaction_code as transactionCode,
-               t1.order_status     as orderStatus,
-               t1.station_id       as stationId,
-               t2.station_name     as stationName,
-               t1.order_amount     as orderAmount,
-               t1.settlement_time  as orderSettleTime
+        select t1.order_code as orderCode,
+        t1.transaction_code as transactionCode,
+        t1.order_status as orderStatus,
+        t1.station_id as stationId,
+        t2.station_name as stationName,
+        t1.order_amount as orderAmount,
+        t1.settlement_time as orderSettleTime
         from order_basic_info t1
-                 left join pile_station_info t2 on t1.station_id = t2.id
+        left join pile_station_info t2 on t1.station_id = t2.id
         where t1.del_flag = '0'
-          and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}
+        and t1.merchant_id = #{dto.merchantId,jdbcType=VARCHAR}
         <if test="dto.startTime != null">
             and t1.create_time <![CDATA[ >= ]]> #{dto.startTime,jdbcType=VARCHAR}
         </if>
@@ -2732,17 +2753,17 @@
     </select>
 
     <select id="batchRefundQuery" resultType="com.jsowell.pile.vo.web.RefundOrder">
-        SELECT t1.order_code     as orderCode,
-               t1.`order_status` as orderStatus,
-               t1.station_id     as stationId,
-               t2.station_name   AS stationName,
-               t1.pay_amount     AS payAmount,
-               t1.order_amount   AS orderAmount,
-               t1.refund_amount  AS refundAmount
+        SELECT t1.order_code as orderCode,
+        t1.`order_status` as orderStatus,
+        t1.station_id as stationId,
+        t2.station_name AS stationName,
+        t1.pay_amount AS payAmount,
+        t1.order_amount AS orderAmount,
+        t1.refund_amount AS refundAmount
         FROM order_basic_info t1
-                 JOIN pile_station_info t2 ON t1.station_id = t2.id
+        JOIN pile_station_info t2 ON t1.station_id = t2.id
         WHERE
-            t1.order_code IN
+        t1.order_code IN
         <foreach close=")" collection="list" item="itme" open="(" separator=",">
             #{itme,jdbcType=VARCHAR}
         </foreach>
@@ -2750,20 +2771,20 @@
 
     <select id="queryOrderList" resultMap="BaseResultMap">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_basic_info
         where del_flag = '0'
-          and order_code in
+        and order_code in
         <foreach close=")" collection="orderCodeList" item="item" open="(" separator=",">
             #{item,jdbcType=VARCHAR}
         </foreach>
     </select>
 
     <select id="getIndexOrderInfoV2" resultType="com.jsowell.pile.vo.web.IndexOrderInfoVO">
-        SELECT trade_date      AS date,
-               order_codes     as orderCodes,
-               use_electricity AS totalElectricity,
-               total_amount    as totalOrderAmount
+        SELECT trade_date AS date,
+        order_codes as orderCodes,
+        use_electricity AS totalElectricity,
+        total_amount as totalOrderAmount
         from settle_order_report
         where del_flag = '0'
         and date(trade_date) &gt;= DATE_SUB(CURDATE(), INTERVAL 30 day)
@@ -2780,10 +2801,10 @@
 
     <select id="getIndexOrderDetail" resultType="com.jsowell.pile.vo.web.IndexOrderInfoVO">
         select
-               sum(sharp_used_electricity)          AS totalSharpUsedElectricity,
-               sum(peak_used_electricity)           AS totalPeakUsedElectricity,
-               sum(flat_used_electricity)           AS totalFlatUsedElectricity,
-               sum(valley_used_electricity)         AS totalValleyUsedElectricity
+        sum(sharp_used_electricity) AS totalSharpUsedElectricity,
+        sum(peak_used_electricity) AS totalPeakUsedElectricity,
+        sum(flat_used_electricity) AS totalFlatUsedElectricity,
+        sum(valley_used_electricity) AS totalValleyUsedElectricity
         from order_detail
         <if test="list != null and list.size() != 0">
             where order_code in
@@ -2796,56 +2817,54 @@
     <update id="updateMerchantByStationId">
         update
             order_basic_info
-        set
-            merchant_id = #{newMerchantId,jdbcType=VARCHAR}
-        where
-            station_id = #{stationId,jdbcType=BIGINT}
+        set merchant_id = #{newMerchantId,jdbcType=VARCHAR}
+        where station_id = #{stationId,jdbcType=BIGINT}
     </update>
 
     <select id="getNROrderInfoByOrderCode" resultType="com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO">
         SELECT
-            t1.station_id as stationId,
-            t1.merchant_id,
-            t1.third_party_type as thirdPartyType,
-            t3.organization_code AS operatorId,
-            t1.pile_connector_code AS connectorId,
-            t1.order_code AS startChargeSeq,
-            t2.total_used_electricity AS elect,
-            t2.sharp_used_electricity AS cuspElect,
-            t2.peak_used_electricity AS peakElect,
-            t2.flat_used_electricity AS flatElect,
-            t2.valley_used_electricity AS valleyElect,
-            t1.charge_start_time AS startTime,
-            t1.charge_end_time AS endTime
+        t1.station_id as stationId,
+        t1.merchant_id,
+        t1.third_party_type as thirdPartyType,
+        t3.organization_code AS operatorId,
+        t1.pile_connector_code AS connectorId,
+        t1.order_code AS startChargeSeq,
+        t2.total_used_electricity AS elect,
+        t2.sharp_used_electricity AS cuspElect,
+        t2.peak_used_electricity AS peakElect,
+        t2.flat_used_electricity AS flatElect,
+        t2.valley_used_electricity AS valleyElect,
+        t1.charge_start_time AS startTime,
+        t1.charge_end_time AS endTime
         FROM
-            order_basic_info t1
-                JOIN order_detail t2 ON t1.order_code = t2.order_code
-                AND t1.del_flag = '0'
-                JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id
-                AND t3.del_flag = '0'
+        order_basic_info t1
+        JOIN order_detail t2 ON t1.order_code = t2.order_code
+        AND t1.del_flag = '0'
+        JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id
+        AND t3.del_flag = '0'
         <where>
             <if test="dto.orderCode != null and dto.orderCode != ''">
                 and t1.order_code = #{dto.orderCode,jdbcType=VARCHAR}
             </if>
             <if test="dto.queryStartTime != null and dto.queryStartTime != '' and dto.queryEndTime != null and dto.queryEndTime != ''">
-                and t1.charge_end_time between #{dto.queryStartTime,jdbcType=VARCHAR} and #{dto.queryEndTime,jdbcType=VARCHAR}
+                and t1.charge_end_time between #{dto.queryStartTime,jdbcType=VARCHAR} and
+                #{dto.queryEndTime,jdbcType=VARCHAR}
             </if>
         </where>
     </select>
 
     <select id="queryOrderPayDetail" resultType="com.jsowell.pile.vo.web.OrderPaymentDetailVO">
-        select
-            t1.order_code as orderCode,
-        t1.create_time as createTime,
-        t1.settlement_time as settlementTime,
-        t1.`pay_amount` as payAmount,
-        t1.refund_amount as refundAmount,
-        t1.settle_amount as settleAmount,
-        t1.refund_amount as refundAmount,
-        t1.merchant_id as merchantId,
-        t2.payment_id as paymentId
+        select t1.order_code      as orderCode,
+               t1.create_time     as createTime,
+               t1.settlement_time as settlementTime,
+               t1.`pay_amount`    as payAmount,
+               t1.refund_amount   as refundAmount,
+               t1.settle_amount   as settleAmount,
+               t1.refund_amount   as refundAmount,
+               t1.merchant_id     as merchantId,
+               t2.payment_id      as paymentId
         from order_basic_info t1
-        join adapay_callback_record t2 on t1.order_code = t2.order_code
+                 join adapay_callback_record t2 on t1.order_code = t2.order_code
         where t1.`del_flag` = '0'
           and t1.settlement_time BETWEEN #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
           and t1.settle_amount &gt; 0.00
@@ -2854,230 +2873,244 @@
 
     <select id="getOrderInfoByNXJT" resultType="com.jsowell.pile.vo.uniapp.customer.OrderVO">
         SELECT
-            t1.charge_start_time AS startTime,
-            t1.station_id AS stationId,
-            t2.station_name AS stationName,
-            t1.plate_number as licensePlateNumber,
-            t1.order_amount AS orderAmount
-        FROM
-            order_basic_info t1
-                JOIN pile_station_info t2 ON t1.station_id = t2.id
-        WHERE t1.del_flag = '0'
-            <if test="licensePlateNumber != null and licensePlateNumber != ''">
-                AND t1.plate_number = #{licensePlateNumber,jdbcType=VARCHAR}
-            </if>
-            <if test="startTime != null and startTime != ''">
-                AND t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
-            </if>
-            <if test="endTime != null and endTime != ''">
-                AND t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
-            </if>
-    </select>
-
-  <select id="queryRepayOrder" resultMap="BaseResultMap">
-    select
-        <include refid="Base_Column_List"/>
-    from order_basic_info
-    where order_status = '3'
-    and member_id =#{memberId,jdbcType=VARCHAR}
-  </select>
-
-  <select id="queryOrderListByGroupCode" resultMap="BaseResultMap">
-    select
-        <include refid="Base_Column_List"/>
-    from order_basic_info
-    where order_status = '6'
-    and pay_mode = '1'
-    and group_code =#{groupCode,jdbcType=VARCHAR}
-  </select>
-
-  <select id="queryXDTOrderList" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List"/>
-    from order_basic_info
-    where order_status = '3'
-    and member_id =#{memberId,jdbcType=VARCHAR}
-  </select>
-
-    <select id="getChargeOrderInfoByOrderCode" resultType="com.jsowell.pile.vo.uniapp.customer.OrderVO">
-        SELECT
-        t1.merchant_id as mercahntId,
-        t3.organization_code as organizationCode,
-        t1.order_code AS orderCode,
-        t1.transaction_code AS transactionCode,
-        t1.order_status AS orderStatus,
-        t1.station_id AS stationId,
-        t1.pile_sn AS pileSn,
-          t1.member_id as memberId,
-        t1.connector_code AS connectorCode,
-        t1.pile_connector_code AS pileConnectorCode,
-        t1.pay_mode AS payMode,
-        t1.pay_amount AS payAmount,
-        t1.pay_time AS payTime,
-        t1.order_amount AS orderAmount,
-        t1.plate_number AS plateNumber,
-        t1.discount_amount AS discountAmount,
-          t1.settlement_time as settlemetTime,
-        t1.settle_amount AS settleAmount,
-          t1.create_time as createTime,
         t1.charge_start_time AS startTime,
-        t1.charge_end_time AS endTime,
-        t1.start_soc AS startSoc,
-        t1.end_soc AS endSoc,
-        t1.reason AS stopReason,
-        t2.total_used_electricity AS totalPower,
-        t2.total_electricity_amount AS totalElectricityAmount,
-        t2.total_service_amount AS totalServiceAmount
+        t1.station_id AS stationId,
+        t2.station_name AS stationName,
+        t1.plate_number as licensePlateNumber,
+        t1.order_amount AS orderAmount
         FROM
         order_basic_info t1
-        JOIN
-        order_detail t2 ON t1.order_code = t2.order_code
-        join
-        pile_merchant_info t3 on t1.merchant_id = t3.id
+        JOIN pile_station_info t2 ON t1.station_id = t2.id
+        WHERE t1.del_flag = '0'
+        <if test="licensePlateNumber != null and licensePlateNumber != ''">
+            AND t1.plate_number = #{licensePlateNumber,jdbcType=VARCHAR}
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND t1.create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND t1.create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+        </if>
+    </select>
+
+    <select id="queryRepayOrder" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where order_status = '3'
+        and member_id =#{memberId,jdbcType=VARCHAR}
+    </select>
+
+    <select id="queryOrderListByGroupCode" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where order_status = '6'
+        and pay_mode = '1'
+        and group_code =#{groupCode,jdbcType=VARCHAR}
+    </select>
+
+    <select id="queryXDTOrderList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where order_status = '3'
+        and member_id =#{memberId,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getChargeOrderInfoByOrderCode" resultType="com.jsowell.pile.vo.uniapp.customer.OrderVO">
+        SELECT t1.merchant_id              as mercahntId,
+               t3.organization_code        as organizationCode,
+               t1.order_code               AS orderCode,
+               t1.transaction_code         AS transactionCode,
+               t1.order_status             AS orderStatus,
+               t1.station_id               AS stationId,
+               t1.pile_sn                  AS pileSn,
+               t1.member_id                as memberId,
+               t1.connector_code           AS connectorCode,
+               t1.pile_connector_code      AS pileConnectorCode,
+               t1.pay_mode                 AS payMode,
+               t1.pay_amount               AS payAmount,
+               t1.pay_time                 AS payTime,
+               t1.order_amount             AS orderAmount,
+               t1.plate_number             AS plateNumber,
+               t1.discount_amount          AS discountAmount,
+               t1.settlement_time          as settlemetTime,
+               t1.settle_amount            AS settleAmount,
+               t1.create_time              as createTime,
+               t1.charge_start_time        AS startTime,
+               t1.charge_end_time          AS endTime,
+               t1.start_soc                AS startSoc,
+               t1.end_soc                  AS endSoc,
+               t1.reason                   AS stopReason,
+               t2.total_used_electricity   AS totalPower,
+               t2.total_electricity_amount AS totalElectricityAmount,
+               t2.total_service_amount     AS totalServiceAmount
+        FROM order_basic_info t1
+                 JOIN
+             order_detail t2 ON t1.order_code = t2.order_code
+                 join
+             pile_merchant_info t3 on t1.merchant_id = t3.id
+        WHERE t1.del_flag = '0'
+          AND t1.order_code = #{orderCode,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getReservedOrder" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where del_flag = '0'
+        and pay_status = '1'
+        and start_type = 'reserved'
+        and order_status = '0'
+        and order_basic_info.reserved_start_time <![CDATA[ <= ]]> #{dateTime,jdbcType=TIMESTAMP}
+    </select>
+
+    <select id="queryOrderListByStationId" resultType="com.jsowell.pile.vo.SupStationStatsVO">
+        SELECT t1.order_code             as orderCode,
+               t3.organization_code      as organizationCode,
+               t1.station_id             AS stationId,
+               t1.pile_sn                AS pileSn,
+               t1.pile_connector_code    AS pileConnectorCode,
+               t1.charge_start_time      AS StartTime,
+               t1.charge_end_time        AS EndTime,
+               t2.total_used_electricity AS totalPower
+        FROM order_basic_info t1
+                 JOIN order_detail t2 ON t1.order_code = t2.order_code
+            AND t1.del_flag = '0'
+                 JOIN pile_merchant_info t3 on t1.merchant_id = t3.id
+        WHERE t1.station_id = #{stationId,jdbcType=VARCHAR}
+          AND t1.charge_start_time <![CDATA[ >= ]]> DATE_SUB(CURDATE(), INTERVAL 1 DAY)
+          AND t1.charge_start_time <![CDATA[ < ]]> CURDATE()
+    </select>
+
+    <select id="queryOrderByOccupyTime" resultType="com.jsowell.pile.vo.web.OrderListVO">
+        SELECT t1.id                       as id,
+               t1.order_code               as orderCode,
+               t1.transaction_code         as transactionCode,
+               t1.order_status             as orderStatus,
+               t1.member_id                as memberId,
+               t2.nick_name                as nickName,
+               t2.mobile_number            as mobileNumber,
+               t1.station_id               as stationId,
+               t3.station_name             as stationName,
+               t1.pile_sn                  as pileSn,
+               t1.connector_code           as connectorCode,
+               t1.logic_card               as logicCard,
+               t1.vin_code                 as vinCode,
+               t1.plate_number             as plateNumber,
+               t1.start_mode               as startMode,
+               t1.third_party_type         as thirdPartyType,
+               t1.pay_mode                 as payMode,
+               t1.pay_status               as payStatus,
+               t1.pay_amount               as payAmount,
+               t1.pay_time                 as payTime,
+               t1.order_amount             as orderAmount,
+               t1.virtual_amount           as virtualAmount,
+               t1.discount_amount          as discountAmount,
+               t1.settle_amount            as settleAmount,
+               t1.settlement_time          as settlementTime,
+               t1.start_soc                as startSoc,
+               t1.end_soc                  as endSoc,
+               t1.charge_start_time        as chargeStartTime,
+               t1.charge_end_time          as chargeEndTime,
+               t1.create_time              as createTime,
+               t4.total_used_electricity   as chargingDegree,
+               t4.total_electricity_amount as totalElectricityAmount,
+               t4.total_service_amount     as totalServiceAmount,
+               t4.sharp_used_electricity   as sharpElectricity,
+               t4.peak_used_electricity    as peakElectricity,
+               t4.flat_used_electricity    as flatElectricity,
+               t4.valley_used_electricity  as valleyElectricity
+        from order_basic_info t1
+                 left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
+                 join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
+                 join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
+        where t1.del_flag = '0'
+          and `t1`.`member_id` = #{memberId,jdbcType=VARCHAR}
+          and `t1`.`station_id` = #{stationId,jdbcType=VARCHAR}
+          and `t1`.`charge_start_time` <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+          and `t1`.`charge_end_time` <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getOrderDetailByStationIds" resultType="com.jsowell.pile.vo.uniapp.business.BusinessOrderDetailInfoVO">
+        SELECT
+        DATE_FORMAT( t1.create_time, '%Y-%m-%d' ) AS tradeDate,
+        <!--      t1.order_code AS orderCode,-->
+        <!--      t1.station_id AS stationId,-->
+        t1.pile_connector_code as pileConnectorCode,
+        t2.sharp_used_electricity AS sharpUsedElectricity,
+        t2.sharp_amount AS sharpAmount,
+        t2.sharp_electricity_price AS sharpElectricityPrice,
+        t2.peak_used_electricity AS peakUsedElectricity,
+        t2.peak_amount AS peakAmount,
+        t2.peak_electricity_price AS peakElectricityPrice,
+        t2.flat_used_electricity AS flatUsedElectricity,
+        t2.flat_amount AS flatAmount,
+        t2.flat_electricity_price AS flatElectricityPrice,
+        t2.valley_used_electricity AS valleyUsedElectricity,
+        t2.valley_amount AS valleyAmount,
+        t2.valley_electricity_price AS valleyElectricityPrice,
+        t2.total_service_amount AS totalServiceAmount,
+        t1.settle_amount AS settleAmount
+        FROM
+        order_basic_info t1
+        JOIN order_detail t2 ON t1.order_code = t2.order_code
+        AND t1.del_flag = '0'
         WHERE
-        t1.del_flag = '0'
-        AND
-        t1.order_code = #{orderCode,jdbcType=VARCHAR}
+        t1.station_id IN
+        <foreach collection="stationIds" item="stationId" open="(" separator="," close=")">
+            #{stationId,jdbcType=VARCHAR}
+        </foreach>
+        AND t1.create_time BETWEEN #{startTime,jdbcType=VARCHAR} AND DATE_ADD(#{endTime,jdbcType=VARCHAR}, INTERVAL 1
+        DAY)
+        order by t1.create_time
     </select>
 
-  <select id="getReservedOrder" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from order_basic_info
-    where del_flag = '0'
-    and pay_status = '1'
-    and start_type = 'reserved'
-    and order_status = '0'
-    and order_basic_info.reserved_start_time <![CDATA[ <= ]]> #{dateTime,jdbcType=TIMESTAMP}
-  </select>
-
-  <select id="queryOrderListByStationId" resultType="com.jsowell.pile.vo.SupStationStatsVO">
-    SELECT
-      t1.order_code as orderCode,
-      t3.organization_code as organizationCode,
-      t1.station_id AS stationId,
-      t1.pile_sn AS pileSn,
-      t1.pile_connector_code AS pileConnectorCode,
-      t1.charge_start_time AS StartTime,
-      t1.charge_end_time AS EndTime,
-      t2.total_used_electricity AS totalPower
-    FROM
-      order_basic_info t1
-        JOIN order_detail t2 ON t1.order_code = t2.order_code
-        AND t1.del_flag = '0'
-    JOIN pile_merchant_info t3 on t1.merchant_id = t3.id
-    WHERE
-      t1.station_id = #{stationId,jdbcType=VARCHAR}
-      AND t1.charge_start_time <![CDATA[ >= ]]> DATE_SUB( CURDATE(), INTERVAL 1 DAY )
-      AND t1.charge_start_time <![CDATA[ < ]]> CURDATE()
-  </select>
-
-  <select id="queryOrderByOccupyTime" resultType="com.jsowell.pile.vo.web.OrderListVO">
-    SELECT t1.id                       as id,
-           t1.order_code               as orderCode,
-           t1.transaction_code         as transactionCode,
-           t1.order_status             as orderStatus,
-           t1.member_id                as memberId,
-           t2.nick_name                as nickName,
-           t2.mobile_number            as mobileNumber,
-           t1.station_id               as stationId,
-           t3.station_name             as stationName,
-           t1.pile_sn                  as pileSn,
-           t1.connector_code           as connectorCode,
-           t1.logic_card               as logicCard,
-           t1.vin_code                 as vinCode,
-           t1.plate_number             as plateNumber,
-           t1.start_mode               as startMode,
-           t1.third_party_type         as thirdPartyType,
-           t1.pay_mode                 as payMode,
-           t1.pay_status               as payStatus,
-           t1.pay_amount               as payAmount,
-           t1.pay_time                 as payTime,
-           t1.order_amount             as orderAmount,
-           t1.virtual_amount           as virtualAmount,
-           t1.discount_amount          as discountAmount,
-           t1.settle_amount            as settleAmount,
-           t1.settlement_time          as settlementTime,
-           t1.start_soc                as startSoc,
-           t1.end_soc                  as endSoc,
-           t1.charge_start_time        as chargeStartTime,
-           t1.charge_end_time          as chargeEndTime,
-           t1.create_time              as createTime,
-           t4.total_used_electricity   as chargingDegree,
-           t4.total_electricity_amount as totalElectricityAmount,
-           t4.total_service_amount     as totalServiceAmount,
-           t4.sharp_used_electricity   as sharpElectricity,
-           t4.peak_used_electricity    as peakElectricity,
-           t4.flat_used_electricity    as flatElectricity,
-           t4.valley_used_electricity  as valleyElectricity
-    from order_basic_info t1
-   left join member_basic_info t2 on t1.member_id = t2.member_id and t2.del_flag = '0'
-   join pile_station_info t3 on t1.station_id = t3.id and t3.del_flag = '0'
-   join order_detail t4 on t4.order_code = t1.order_code and t4.del_flag = '0'
-    where t1.del_flag = '0'
-      and `t1`.`member_id` = #{memberId,jdbcType=VARCHAR}
-      and `t1`.`station_id` = #{stationId,jdbcType=VARCHAR}
-      and `t1`.`charge_start_time` <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
-      and `t1`.`charge_end_time` <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
-  </select>
-
-  <select id="getOrderDetailByStationIds" resultType="com.jsowell.pile.vo.uniapp.business.BusinessOrderDetailInfoVO">
-    SELECT
-      DATE_FORMAT( t1.create_time, '%Y-%m-%d' ) AS tradeDate,
-<!--      t1.order_code AS orderCode,-->
-<!--      t1.station_id AS stationId,-->
-    t1.pile_connector_code as pileConnectorCode,
-      t2.sharp_used_electricity AS sharpUsedElectricity,
-      t2.sharp_amount AS sharpAmount,
-      t2.sharp_electricity_price AS sharpElectricityPrice,
-      t2.peak_used_electricity AS peakUsedElectricity,
-      t2.peak_amount AS peakAmount,
-      t2.peak_electricity_price AS peakElectricityPrice,
-      t2.flat_used_electricity AS flatUsedElectricity,
-      t2.flat_amount AS flatAmount,
-      t2.flat_electricity_price AS flatElectricityPrice,
-      t2.valley_used_electricity AS valleyUsedElectricity,
-      t2.valley_amount AS valleyAmount,
-      t2.valley_electricity_price AS valleyElectricityPrice,
-      t2.total_service_amount AS totalServiceAmount,
-      t1.settle_amount AS settleAmount
-    FROM
-      order_basic_info t1
-        JOIN order_detail t2 ON t1.order_code = t2.order_code
-        AND t1.del_flag = '0'
-    WHERE
-      t1.station_id IN
-      <foreach collection="stationIds" item="stationId" open="(" separator="," close=")">
-        #{stationId,jdbcType=VARCHAR}
-      </foreach>
-      AND t1.create_time BETWEEN #{startTime,jdbcType=VARCHAR} AND DATE_ADD(#{endTime,jdbcType=VARCHAR}, INTERVAL 1 DAY)
-    order by t1.create_time
+    <select id="queryOrdersByPileConnectorCodeAndStatus" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where del_flag = '0'
+        and pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}
+        and order_status != '7'
+        <if test="orderStatus != null and orderStatus != ''">
+            and order_status = #{orderStatus,jdbcType=VARCHAR}
+        </if>
+        <if test="payStatus != null and payStatus != ''">
+            and pay_status = #{payStatus,jdbcType=VARCHAR}
+        </if>
+        order by create_time DESC
+        limit 20
     </select>
 
-  <select id="queryOrdersByPileConnectorCodeAndStatus" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from order_basic_info
-    where del_flag = '0'
-    and pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}
-    and order_status != '7'
-    <if test="orderStatus != null and orderStatus != ''">
-      and order_status = #{orderStatus,jdbcType=VARCHAR}
-    </if>
-    <if test="payStatus != null and payStatus != ''">
-      and pay_status = #{payStatus,jdbcType=VARCHAR}
-    </if>
-    order by create_time DESC
-    limit 20
-  </select>
+    <select id="tempGetOrderCodes" resultType="java.lang.String">
+        select order_code
+        from order_basic_info
+        where station_id = #{stationId,jdbcType=VARCHAR}
+          and create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+    </select>
 
-  <select id="tempGetOrderCodes" resultType="java.lang.String">
-    select
-      order_code
-    from
-      order_basic_info
-    where
-      station_id = #{stationId,jdbcType=VARCHAR}
-    and create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+    <select id="selectThirdPartyOrderList" resultType="com.jsowell.pile.vo.uniapp.customer.OrderVO">
+        select t1.order_code as orderCode,
+        t1.start_mode as startMode,
+        t1.pile_connector_code as pileConnectorCode,
+        t1.charge_start_time as startTime,
+        t1.charge_end_time as endTime,
+        t2.total_used_electricity as totalPower,
+        t2.total_electricity_amount as totalElectricityAmount,
+        t2.total_service_amount as totalServiceAmount,
+        t1.order_amount as orderAmount
+        from order_basic_info t1
+        join order_detail t2 on t1.order_code = t2.order_code
+        and t1.del_flag = '0'
+        <where>
+            <if test="dto.lastQueryTime != null and dto.lastQueryTime != ''">
+                and t1.create_time <![CDATA[ >= ]]> #{dto.lastQueryTime,jdbcType=VARCHAR}
+            </if>
+            <if test="dto.lastQueryEndTime != null and dto.lastQueryEndTime != ''">
+                and t1.create_time <![CDATA[ <= ]]> #{dto.lastQueryEndTime,jdbcType=VARCHAR}
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java
index 258829dd1..2cc819833 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/ConnectorStatsInfo.java
@@ -29,4 +29,16 @@ public class ConnectorStatsInfo {
      */
     @JSONField(name = "ConnectorElectricity")
     private BigDecimal connectorElectricity;
+
+    /**
+     * 充电时长（单位：s）
+     */
+    @JSONField(name = "ConnectorDuration")
+    private Integer connectorDuration;
+
+    /**
+     * 充电次数
+     */
+    @JSONField(name = "ConnectorNum")
+    private Integer connectorNum;
 }
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java
index 02dcd39de..c690aa723 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/EquipmentStatsInfo.java
@@ -31,6 +31,18 @@ public class EquipmentStatsInfo {
     @JSONField(name = "EquipmentElectricity")
     private BigDecimal equipmentElectricity;
 
+    /**
+     * 充电时长（单位：s）
+     */
+    @JSONField(name = "ConnectorDuration")
+    private Integer connectorDuration;
+
+    /**
+     * 充电次数
+     */
+    @JSONField(name = "ConnectorNum")
+    private Integer connectorNum;
+
     /**
      * 充电设备接口统计信息列表  Y
      * 充设备的所有充电设备接口统计对象集合
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java
index b10b7b3f1..26b0e54e9 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/domain/StationStatsInfo.java
@@ -44,6 +44,18 @@ public class StationStatsInfo {
     @JSONField(name = "StationElectricity")
     private BigDecimal stationElectricity;
 
+    /**
+     * 充电时长（单位：s）
+     */
+    @JSONField(name = "ConnectorDuration")
+    private Integer connectorDuration;
+
+    /**
+     * 充电次数
+     */
+    @JSONField(name = "ConnectorNum")
+    private Integer connectorNum;
+
     /**
      * 充电设备统计信息列表
      */
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/ChargeOrderInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/ChargeOrderInfo.java
index 9d7dcd74c..edefc1f34 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/ChargeOrderInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/ChargeOrderInfo.java
@@ -51,6 +51,12 @@ public class ChargeOrderInfo {
     @JSONField(name = "ConnectorID")
     private String connectorId;
 
+    /**
+     * 用户发起充电类型
+     */
+    @JSONField(name = "StartChargeType")
+    private Integer startChargeType;
+
     /**
      * 充电订单号
      */
@@ -110,6 +116,19 @@ public class ChargeOrderInfo {
     @JSONField(name = "TotalElecMoney")
     private BigDecimal totalElecMoney;
 
+    /**
+     * 累计电费
+     */
+    @JSONField(name = "ElecMoney")
+    private BigDecimal elecMoney;
+
+
+    /**
+     * 累计服务费
+     */
+    @JSONField(name = "SeviceMoney")
+    private BigDecimal seviceMoney;
+
     /**
      * 本次充电服务费金额
      * 保留小数点后 2 位
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java
index e47cb030d..b2c92b55f 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java
@@ -68,6 +68,12 @@ public class StationInfo extends BaseStationInfo {
     @JSONField(name = "AreaCode")
     private String areaCode;
 
+    /**
+     * 街道编码
+     */
+    @JSONField(name = "StreetCode")
+    private String streetCode;
+
     /**
      * 详细地址  Y
      * <=50字符
@@ -254,6 +260,20 @@ public class StationInfo extends BaseStationInfo {
     @JSONField(name = "EquipmentInfos")
     private List<EquipmentInfo> equipmentInfos;
 
+    /**
+     * 投建日期
+     *
+     */
+    @JSONField(name = "RunDate")
+    private String runDate;
+
+    /**
+     * 投建日期
+     *
+     */
+    @JSONField(name = "BuildDate")
+    private String buildDate;
+
     /**
      * 是否独立报桩 (0-否;1-是) Y
      * 如果是独立报桩需要填写户号以及容量
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java
index 07c749298..b48e43f18 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/ThirdPartyPlatformService.java
@@ -205,6 +205,16 @@ public interface ThirdPartyPlatformService extends InitializingBean {
         throw new UnsupportedOperationException("This method is not yet implemented");
     }
 
+    /**
+     * 查询已完成订单列表信息接口
+     * query_finish_orders
+     * @param dto
+     * @return
+     */
+    default Map<String, String> queryFinishOrders(QueryStartChargeDTO dto) {
+        throw new UnsupportedOperationException("This method is not yet implemented");
+    }
+
     /**
      * VIN码充电 insert_start_charge
      * 华为平台
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java
index 12ab17ed3..a51df5203 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java
@@ -1,8 +1,63 @@
 package com.jsowell.thirdparty.platform.service.impl;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Lists;
+import com.jsowell.common.constant.Constants;
+import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
+import com.jsowell.common.core.redis.RedisCache;
+import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum;
+import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
+import com.jsowell.common.enums.ykc.OrderStatusEnum;
+import com.jsowell.common.enums.ykc.ReturnCodeEnum;
+import com.jsowell.common.enums.ykc.StartModeEnum;
+import com.jsowell.common.exception.BusinessException;
+import com.jsowell.common.util.DateUtils;
+import com.jsowell.common.util.JWTUtils;
+import com.jsowell.common.util.PageUtils;
+import com.jsowell.common.util.StringUtils;
+import com.jsowell.pile.domain.AreaCodeInfo;
+import com.jsowell.pile.domain.OrderBasicInfo;
+import com.jsowell.pile.domain.OrderDetail;
+import com.jsowell.pile.dto.QueryStartChargeDTO;
+import com.jsowell.pile.dto.QueryStationInfoDTO;
+import com.jsowell.pile.service.*;
+import com.jsowell.pile.thirdparty.CommonParamsDTO;
+import com.jsowell.pile.thirdparty.EquipmentInfo;
+import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
+import com.jsowell.pile.vo.base.ConnectorInfoVO;
+import com.jsowell.pile.vo.base.MerchantInfoVO;
+import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO;
+import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
+import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
+import com.jsowell.pile.vo.uniapp.customer.OrderVO;
+import com.jsowell.pile.vo.web.PileConnectorInfoVO;
+import com.jsowell.pile.vo.web.PileStationVO;
+import com.jsowell.thirdparty.lianlian.domain.*;
+import com.jsowell.thirdparty.lianlian.vo.AccessTokenVO;
+import com.jsowell.thirdparty.platform.common.ChargeOrderInfo;
+import com.jsowell.thirdparty.platform.domain.SupChargeDetails;
+import com.jsowell.thirdparty.platform.domain.SupEquipChargeStatusInfo;
+import com.jsowell.thirdparty.platform.domain.SupStationInfo;
+import com.jsowell.thirdparty.platform.factory.ThirdPartyPlatformFactory;
 import com.jsowell.thirdparty.platform.service.ThirdPartyPlatformService;
+import com.jsowell.thirdparty.platform.util.Cryptos;
+import com.jsowell.thirdparty.platform.util.HttpRequestUtil;
+import com.jsowell.thirdparty.platform.util.ThirdPartyPlatformUtils;
+import com.jsowell.thirdparty.service.ThirdpartySecretInfoService;
+import com.yi.business.geo.GeoCodeInfo;
+import com.yi.business.geo.TermRelationTreeCoordinate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
 /**
  * 广西省平台Service
  *
@@ -11,9 +66,609 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class GuangXiPlatformServiceImpl implements ThirdPartyPlatformService {
+    // 平台类型
+    private final String thirdPlatformType = ThirdPlatformTypeEnum.GUANG_XI_PLATFORM.getTypeCode();
+
+    @Autowired
+    private RedisCache redisCache;
+
+    @Autowired
+    private ThirdpartySecretInfoService thirdpartySecretInfoService;
+
+    @Autowired
+    private PileStationInfoService pileStationInfoService;
+
+    @Autowired
+    private PileBasicInfoService pileBasicInfoService;
+
+    @Autowired
+    private PileBillingTemplateService pileBillingTemplateService;
+
+    @Autowired
+    private PileConnectorInfoService pileConnectorInfoService;
+
+    @Autowired
+    private OrderBasicInfoService orderBasicInfoService;
+
+    @Autowired
+    private IAreaCodeInfoService areaCodeInfoService;
+
     @Override
     public void afterPropertiesSet() throws Exception {
+        ThirdPartyPlatformFactory.register(thirdPlatformType, this);
+    }
+
+    /**
+     * 查询令牌 query_token
+     *
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryToken(CommonParamsDTO dto) {
+        AccessTokenVO vo = new AccessTokenVO();
+        // 0:成功；1:失败
+        int succStat = 0;
+        // 0:无；1:无此对接平台；2:密钥错误； 3～99:自定义
+        int failReason = 0;
+
+        String operatorId = dto.getOperatorID();
+        // token缓存key值
+        String redisKey = operatorId + "_token:";
+        // 通过operatorId 查出 operatorSecret
+        ThirdPartySecretInfoVO thirdPartySecretInfoVO = getGuangXiSecretInfo();
+        if (thirdPartySecretInfoVO == null) {
+            failReason = 1;
+            succStat = 1;
+        } else {
+            String ourOperatorSecret = thirdPartySecretInfoVO.getOurOperatorSecret();
+            String dataSecret = thirdPartySecretInfoVO.getOurDataSecret();
+            String dataSecretIv = thirdPartySecretInfoVO.getOurDataSecretIv();
+            // 解密data 获取参数中的OperatorSecret
+            String decrypt = Cryptos.decrypt(dto.getData(), dataSecret, dataSecretIv);
+            String inputOperatorSecret = null;
+            if (StringUtils.isNotBlank(decrypt)) {
+                inputOperatorSecret = JSON.parseObject(decrypt).getString("OperatorSecret");
+            }
+            // 对比密钥
+            if (!StringUtils.equals(ourOperatorSecret, inputOperatorSecret)) {
+                failReason = 1;
+                succStat = 1;
+            } else {
+                // 先查缓存中是否有已生成的token
+                String token = redisCache.getCacheObject(redisKey);
+                int expiredTime = (int) redisCache.getExpire(redisKey);
+                if (StringUtils.isBlank(token)) {
+                    // 生成token
+                    token = JWTUtils.createToken(operatorId, ourOperatorSecret, JWTUtils.ttlMillis);
+                    expiredTime = (int) (JWTUtils.ttlMillis / 1000);
+                }
+                vo.setAccessToken(token);
+                vo.setTokenAvailableTime(expiredTime);
+                // 设置缓存
+                redisCache.setCacheObject(redisKey, token, expiredTime, TimeUnit.SECONDS);
+            }
+        }
+        // 组装返回参数
+        vo.setOperatorID(operatorId);
+        vo.setFailReason(failReason);
+        vo.setSuccStat(succStat);
+
+        Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(vo, thirdPartySecretInfoVO.getOurDataSecret()
+                , thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getOurSigSecret());
+        return resultMap;
+    }
+
+    /**
+     * 查询充电站信息 query_stations_info
+     *
+     * @param dto 查询站点信息dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryStationsInfo(QueryStationInfoDTO dto) {
+        int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo();
+        int pageSize = dto.getPageSize() == null ? 50 : dto.getPageSize();
+        dto.setThirdPlatformType(thirdPlatformType);
+
+        PageUtils.startPage(pageNo, pageSize);
+        List<ThirdPartyStationInfoVO> stationInfos = pileStationInfoService.selectStationInfosByThirdParty(dto);
+        if (CollectionUtils.isEmpty(stationInfos)) {
+            // 未查到数据
+            return null;
+        }
+        ThirdPartySecretInfoVO thirdPartySecretInfoVO = getGuangXiSecretInfo();
+
+        PageInfo<ThirdPartyStationInfoVO> pageInfo = new PageInfo<>(stationInfos);
+        List<SupStationInfo> resultList = new ArrayList<>();
+        for (ThirdPartyStationInfoVO pileStationInfo : pageInfo.getList()) {
+            SupStationInfo info = SupStationInfo.builder()
+                    .stationID(String.valueOf(pileStationInfo.getId()))
+                    .operatorID(Constants.OPERATORID_JIANG_SU)
+                    .equipmentOwnerID(ThirdPartyPlatformUtils.extractEquipmentOwnerID(pileStationInfo.getOrganizationCode()))
+                    .stationName(pileStationInfo.getStationName())
+                    .countryCode(pileStationInfo.getCountryCode())
+                    // .areaCode()
+                    // .streetCode()
+                    .address(pileStationInfo.getAddress())
+                    .serviceTel(pileStationInfo.getServiceTel())
+                    .stationType(Integer.parseInt(pileStationInfo.getStationType()))
+                    .stationStatus(Integer.parseInt(pileStationInfo.getStationStatus()))
+                    .parkNums(Integer.parseInt(pileStationInfo.getParkNums()))
+                    .stationLng(new BigDecimal(pileStationInfo.getStationLng()))
+                    .stationLat(new BigDecimal(pileStationInfo.getStationLat()))
+                    .construction(Integer.parseInt(pileStationInfo.getConstruction()))
+                    // .electricityFee()
+                    // .serviceFee()
+                    // .equipmentInfos()
+                    .runDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileStationInfo.getCreateTime()))
+                    .buildDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, pileStationInfo.getCreateTime()))
+
+                    .build();
+
+            JSONObject electricityFee = new JSONObject();
+            JSONObject serviceFee = new JSONObject();
+            // 查询计费模板
+            List<BillingPriceVO> priceList = pileBillingTemplateService.queryBillingPrice(String.valueOf(pileStationInfo.getId()));
+            for (BillingPriceVO billingPriceVO : priceList) {
+                electricityFee.put(billingPriceVO.getStartTime() + ":00-" + billingPriceVO.getEndTime() + ":00", billingPriceVO.getElectricityPrice());
+                serviceFee.put(billingPriceVO.getStartTime() + ":00-" + billingPriceVO.getEndTime() + ":00", billingPriceVO.getServicePrice());
+            }
+            info.setElectricityFee(electricityFee.toJSONString());
+            info.setServiceFee(serviceFee.toJSONString());
+
+            // AreaCode
+            String areaCode = pileStationInfo.getAreaCode();  // 330000,330200,330213
+            // 根据逗号分组
+            String[] split = StringUtils.split(areaCode, ",");
+            // 只取最后一部分  330213
+            String subAreaCode = split[split.length - 1];
+            info.setAreaCode(subAreaCode);
+
+            List<EquipmentInfo> pileList = pileBasicInfoService.getPileListForLianLian(String.valueOf(pileStationInfo.getId()));
+            if (CollectionUtils.isNotEmpty(pileList)) {
+                info.setEquipmentInfos(pileList); // 充电设备信息列表
+            }
+
+            // areaCodeCountryside
+            GeoCodeInfo geoCode = TermRelationTreeCoordinate.completeGeoCode(pileStationInfo.getAddress());
+            if (geoCode == null) {
+                // String areaCodeCountryside = geoCode.getCounty_code();
+                info.setStreetCode("123456789101");
+            } else {
+                AreaCodeInfo areaCodeInfo = new AreaCodeInfo();
+                if (StringUtils.isNotBlank(geoCode.getTownName())) {
+                    String townName = geoCode.getTownName();
+                    areaCodeInfo.setName(townName);
+                } else {
+                    String countyName = geoCode.getCountyName();
+                    areaCodeInfo.setName(countyName);
+                }
+                List<AreaCodeInfo> areaCodeInfoList = areaCodeInfoService.selectAreaCodeInfoList(areaCodeInfo);
+                info.setStreetCode(String.valueOf(areaCodeInfoList.get(0).getAreaCode()));
+            }
+            resultList.add(info);
+        }
+
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("PageNo", pageInfo.getPageNum());
+        map.put("PageCount", pageInfo.getPages());
+        map.put("ItemSize", pageInfo.getTotal());
+        map.put("StationInfos", resultList);
+        Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
+                thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
+        return resultMap;
+    }
+
+    /**
+     * 设备接口状态查询接口 query_station_status
+     * @param dto 查询站点信息dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryStationStatus(QueryStationInfoDTO dto) {
+        List<String> stationIds = dto.getStationIds();
+        List<StationStatusInfo> stationStatusInfos = new ArrayList<>();
+        List<Object> connectorStatusInfos = new ArrayList<>();
+        // 查询密钥信息
+        ThirdPartySecretInfoVO thirdPartySecretInfoVO = getGuangXiSecretInfo();
+
+        // 根据站点idList查询枪口列表
+        List<ConnectorInfoVO> list = pileConnectorInfoService.batchSelectConnectorList(stationIds);
+        // 根据站点id分组
+        Map<String, List<ConnectorInfoVO>> collect = list.stream()
+                .collect(Collectors.groupingBy(ConnectorInfoVO::getStationId));
+        // 封装参数
+        for (Map.Entry<String, List<ConnectorInfoVO>> entry : collect.entrySet()) {
+            String stationId = entry.getKey();
+            List<ConnectorInfoVO> voList = entry.getValue();
+            StationStatusInfo stationStatusInfo = new StationStatusInfo();
+
+            stationStatusInfo.setStationId(stationId);
+            stationStatusInfo.setStationStatus(50); // 50-正常使用
+            ConnectorStatusInfo connectorStatusInfo;
+            for (ConnectorInfoVO connectorInfoVO : voList) {
+                connectorStatusInfo = ConnectorStatusInfo.builder()
+                        .connectorID(connectorInfoVO.getPileConnectorCode())
+                        .status(Integer.parseInt(connectorInfoVO.getConnectorStatus()))
+
+                        .build();
+                connectorStatusInfos.add(connectorStatusInfo);
+            }
+            stationStatusInfo.setConnectorStatusInfos(connectorStatusInfos);
+
+            stationStatusInfos.add(stationStatusInfo);
+        }
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("StationStatusInfos", stationStatusInfos);
+
+        Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
+                thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
+        return resultMap;
+    }
+
+    /**
+     * 推送设备状态变化接口 notification_stationStatus
+     * @param stationId 站点id
+     * @param pileConnectorCode 充电桩枪口编号
+     * @param status
+     * @param secretInfoVO
+     * @return
+     */
+    @Override
+    public String notificationStationStatus(String stationId, String pileConnectorCode, String status, ThirdPartySecretInfoVO secretInfoVO) {
+        // 查询相关配置信息
+        ThirdPartySecretInfoVO ganSuSecretInfo = getGuangXiSecretInfo();
+
+        String operatorId = Constants.OPERATORID_JIANG_SU;
+        String operatorSecret = ganSuSecretInfo.getTheirOperatorSecret();
+        String signSecret = ganSuSecretInfo.getTheirSigSecret();
+        String dataSecret = ganSuSecretInfo.getTheirDataSecret();
+        String dataSecretIv = ganSuSecretInfo.getTheirDataSecretIv();
+        String urlAddress = ganSuSecretInfo.getTheirUrlPrefix();
+
+        String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_STATION_STATUS.getValue();
+        ConnectorStatusInfo info = ConnectorStatusInfo.builder()
+                .connectorID(pileConnectorCode)
+                .status(Integer.parseInt(status))
+                .build();
+        // 调用联联平台接口
+        JSONObject json = new JSONObject();
+        json.put("DataType", Constants.ZERO);
+        json.put("ConnectorStatusInfo", info);
+        String jsonString = JSON.toJSONString(json);
+        // 获取令牌
+        String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
+        String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret);
+        return result;
+    }
+
+    /**
+     * 查询统计信息接口 query_station_stats
+     * @param dto 查询站点信息dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryStationStats(QueryStationInfoDTO dto) {
+        ThirdPartySecretInfoVO thirdPartySecretInfoVO = getGuangXiSecretInfo();
+        // 根据站点id 查出这段时间的充电量
+        List<AccumulativeInfoVO> list = orderBasicInfoService.getAccumulativeInfoForLianLian(dto);
+        if (CollectionUtils.isEmpty(list)) {
+            return null;
+        }
+
+        // 根据充电桩编号分组 key=充电桩编号
+        Map<String, List<AccumulativeInfoVO>> pileMap = list.stream()
+                .collect(Collectors.groupingBy(AccumulativeInfoVO::getPileSn));
+
+        // 存放所有充电桩设备
+        List<EquipmentStatsInfo> equipmentStatsInfoList = Lists.newArrayList();
+        // 站点用电量
+        BigDecimal stationElectricity = BigDecimal.ZERO;
+        int stationChargingTime = Constants.zero;
+        // 用于记录桩充电量 在循环每个枪口的时候初始化
+        BigDecimal pileElec;
+        // 桩充电次数
+        int pileChargingNum;
+        // 桩充电时长
+        int pileChargingTime;
+        for (String pileSn : pileMap.keySet()) {
+            // 该充电桩下 所有枪口的用电数据
+            List<AccumulativeInfoVO> accumulativeInfoVOS = pileMap.get(pileSn);
+            if (CollectionUtils.isEmpty(accumulativeInfoVOS)) {
+                continue;
+            }
+            // 存放充电桩用电量
+            pileElec = BigDecimal.ZERO;
+            // 充电桩充电次数
+            pileChargingNum = Constants.zero;
+            // 充电桩充电时长
+            pileChargingTime = Constants.zero;
+
+            // key=枪口编号  value 该枪口的用电数据
+            Map<String, List<AccumulativeInfoVO>> collect = accumulativeInfoVOS.stream()
+                    .collect(Collectors.groupingBy(AccumulativeInfoVO::getPileConnectorCode));
+
+            List<ConnectorStatsInfo> connectorStatsInfos = Lists.newArrayList();
+            for (Map.Entry<String, List<AccumulativeInfoVO>> entry : collect.entrySet()) {
+                String pileConnectorCode = entry.getKey();
+                List<AccumulativeInfoVO> value = entry.getValue();
+                // 枪口用电量求和
+                BigDecimal connectorElec = value.stream()
+                        .map(AccumulativeInfoVO::getConnectorElectricity)
+                        .map(BigDecimal::new)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                // 充电时长求和
+                BigDecimal chargingTime = value.stream()
+                        .map(AccumulativeInfoVO::getChargingTime)
+                        .map(BigDecimal::new)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+                // 充电次数
+                long chargingNumLong = accumulativeInfoVOS.stream()
+                        .map(x -> x.getPileConnectorCode().equals(pileConnectorCode))
+                        .count();
+                int chargingNum = Integer.parseInt(String.valueOf(chargingNumLong));
+
+                connectorStatsInfos.add(
+                        ConnectorStatsInfo.builder()
+                                .connectorID(pileConnectorCode)
+                                .connectorElectricity(connectorElec)
+                                .connectorDuration(chargingTime.intValue())
+                                .connectorNum(chargingNum)
+                                .build()
+                );
+                // 充电桩电量为枪口用电量累计
+                pileElec = pileElec.add(connectorElec);
+                // 充电桩充电次数为枪口充电次数累计
+                pileChargingNum += chargingNum;
+                // 充电时长
+                pileChargingTime += chargingTime.intValue();
+            }
+
+            EquipmentStatsInfo build = EquipmentStatsInfo.builder()
+                    .equipmentID(pileSn)
+                    .equipmentElectricity(pileElec)
+                    .connectorDuration(pileChargingTime)
+                    .connectorNum(pileChargingNum)
+                    .connectorStatsInfos(connectorStatsInfos)
+                    .build();
+            equipmentStatsInfoList.add(build);
+
+            // 所有充电桩用电量之和
+            stationElectricity = stationElectricity.add(pileElec);
+            // 充电时长
+            stationChargingTime += pileChargingTime;
+        }
+
+        StationStatsInfo stationStatsInfo = StationStatsInfo.builder()
+                .stationID(dto.getStationID())
+                .startTime(dto.getStartTime())
+                .endTime(dto.getEndTime())
+                .stationElectricity(stationElectricity)
+                .connectorDuration(stationChargingTime)
+                .connectorNum(list.size())
+                .equipmentStatsInfos(equipmentStatsInfoList) // 设备列表
+                .build();
+
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("StationStats", stationStatsInfo);
+
+        Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
+                thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
+
+        return resultMap;
+    }
+
+    /**
+     * 推送已完成订单信息接口 notification_charge_order_info
+     * @param orderCode
+     * @param secretInfoVO
+     * @return
+     */
+    @Override
+    public String notificationChargeOrderInfo(String orderCode, ThirdPartySecretInfoVO secretInfoVO) {
+        // 根据订单号查询出信息
+        OrderBasicInfo orderBasicInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+        if (orderBasicInfo == null) {
+            return null;
+        }
+
+        String operatorId = Constants.OPERATORID_JIANG_SU;
+        String operatorSecret = secretInfoVO.getTheirOperatorSecret();
+        String signSecret = secretInfoVO.getTheirSigSecret();
+        String dataSecret = secretInfoVO.getTheirDataSecret();
+        String dataSecretIv = secretInfoVO.getTheirDataSecretIv();
+        String urlAddress = secretInfoVO.getTheirUrlPrefix();
+
+        // 推送地址
+        String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_CHARGE_ORDER_INFO.getValue();
+
+        // 根据订单号查询订单详情
+        OrderDetail orderDetail = orderBasicInfoService.getOrderDetailByOrderCode(orderCode);
+        if (orderDetail == null) {
+            return null;
+        }
+
+        ChargeOrderInfo chargeOrderInfo = ChargeOrderInfo.builder()
+                .startChargeSeq(orderCode)
+                // .startChargeType()
+                .connectorId(orderBasicInfo.getPileConnectorCode())
+                .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()))
+                .endTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeEndTime()))
+                .totalPower(orderDetail.getTotalUsedElectricity())
+                // .totalElecMoney(orderDetail.getTotalElectricityAmount())
+                // .totalSeviceMoney(orderDetail.getTotalServiceAmount())
+                .elecMoney(orderDetail.getTotalElectricityAmount())
+                .seviceMoney(orderDetail.getTotalServiceAmount())
+                .totalMoney(orderDetail.getTotalOrderAmount())
+
+                .build();
+        // startChargeType
+        String startMode = orderBasicInfo.getStartMode();
+        if (StringUtils.equals(StartModeEnum.AUTH_CARD.getValue(), startMode)
+                || StringUtils.equals(StartModeEnum.OFFLINE_CARD.getValue(), startMode)) {
+            chargeOrderInfo.setStartChargeType(3); // 3-卡启动
+        }else {
+            chargeOrderInfo.setStartChargeType(Constants.one);
+        }
+
+        // 获取令牌
+        String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
+        if (StringUtils.isBlank(token)) {
+            return null;
+        }
+
+        // 调用平台接口
+        String jsonString = JSON.toJSONString(chargeOrderInfo);
+        String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret);
+        return result;
+    }
+
+    /**
+     * 查询已完成订单列表信息接口 query_finish_orders
+     * @param dto
+     * @return
+     */
+    @Override
+    public Map<String, String> queryFinishOrders(QueryStartChargeDTO dto) {
+        int pageNo = dto.getPageNo() == null ? 1 : dto.getPageNo();
+        int pageSize = dto.getPageSize() == null ? 10 : dto.getPageSize();
+        List<ChargeOrderInfo> orderInfos = new ArrayList<>();
+
+        PageUtils.startPage(pageNo, pageSize);
+        List<OrderVO> orderVOS = orderBasicInfoService.selectThirdPartyOrderList(dto);
+
+        PageInfo<OrderVO> pageInfo = new PageInfo<>(orderVOS);
+
+        for (OrderVO orderVO : pageInfo.getList()) {
+            ChargeOrderInfo chargeOrderInfo = ChargeOrderInfo.builder()
+                    .startChargeSeq(orderVO.getOrderCode())
+                    // .startChargeType()
+                    .connectorId(orderVO.getPileConnectorCode())
+                    .startTime(orderVO.getStartTime())
+                    .endTime(orderVO.getStartTime())
+                    .totalPower(new BigDecimal(orderVO.getTotalPower()))
+                    .elecMoney(orderVO.getTotalElectricityAmount())
+                    .seviceMoney(orderVO.getTotalServiceAmount())
+                    .totalMoney(orderVO.getOrderAmount())
+
+                    .build();
+
+            // startChargeType
+            String startMode = orderVO.getStartMode();
+            if (StringUtils.equals(StartModeEnum.AUTH_CARD.getValue(), startMode)
+                    || StringUtils.equals(StartModeEnum.OFFLINE_CARD.getValue(), startMode)) {
+                chargeOrderInfo.setStartChargeType(3); // 3-卡启动
+            }else {
+                chargeOrderInfo.setStartChargeType(Constants.one);
+            }
+
+            orderInfos.add(chargeOrderInfo);
+        }
+        ThirdPartySecretInfoVO thirdPartySecretInfoVO = getGuangXiSecretInfo();
+
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("PageNo", pageInfo.getPageNum());
+        map.put("PageCount", pageInfo.getPages());
+        map.put("ItemSize", pageInfo.getTotal());
+        map.put("ChargeOrders", orderInfos);
+        map.put("LastQueryTime", dto.getLastQueryTime());
+        map.put("LastQueryEndTime", dto.getLastQueryEndTime());
+
+        Map<String, String> resultMap = ThirdPartyPlatformUtils.generateResultMapV2(map, thirdPartySecretInfoVO.getOurDataSecret(),
+                thirdPartySecretInfoVO.getOurDataSecretIv(), thirdPartySecretInfoVO.getTheirSigSecret());
+
+        return resultMap;
 
     }
 
-}
+    /**
+     * 推送充电状态接口 notification_equip_charge_status
+     * @param orderCode 订单编号
+     * @return
+     */
+    @Override
+    public String notificationEquipChargeStatus(String orderCode) {
+        // 根据订单号查询订单信息
+        OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByOrderCode(orderCode);
+        // 查询相关配置信息
+        ThirdPartySecretInfoVO thirdPartySecretInfoVO = getGuangXiSecretInfo();
+
+        String operatorId = Constants.OPERATORID_JIANG_SU;
+        String operatorSecret = thirdPartySecretInfoVO.getTheirOperatorSecret();
+        String signSecret = thirdPartySecretInfoVO.getTheirSigSecret();
+        String dataSecret = thirdPartySecretInfoVO.getTheirDataSecret();
+        String dataSecretIv = thirdPartySecretInfoVO.getTheirDataSecretIv();
+        String urlAddress = thirdPartySecretInfoVO.getTheirUrlPrefix();
+
+        // 查询枪口实时状态
+        List<RealTimeMonitorData> chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderInfo.getTransactionCode());
+        RealTimeMonitorData realTimeMonitorData;
+        if (CollectionUtils.isEmpty(chargingRealTimeData)) {
+            realTimeMonitorData = RealTimeMonitorData.builder()
+                    .chargingDegree(Constants.ZERO)
+                    .connectorStatus("3")
+                    .build();
+            chargingRealTimeData.add(realTimeMonitorData);
+        } else {
+            realTimeMonitorData = chargingRealTimeData.get(0);
+        }
+
+        // 查询枪口状态
+        PileConnectorInfoVO info = pileConnectorInfoService.getPileConnectorInfoByConnectorCode(orderInfo.getPileConnectorCode());
+        if (Objects.isNull(info)) {
+            throw new BusinessException(ReturnCodeEnum.CODE_CONNECTOR_INFO_NULL_ERROR);
+        }
+
+        String orderStatus = orderInfo.getOrderStatus();
+        if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderStatus)) {
+            // 充电中
+            orderStatus = "2";
+        } else if (StringUtils.equals(OrderStatusEnum.ORDER_COMPLETE.getValue(), orderStatus)) {
+            // 充电完成
+            orderStatus = "4";
+        }
+        BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : info.getCurrent();
+        BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : info.getVoltage();
+        String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : info.getSOC();
+
+        String dateTime = DateUtils.getDateTime();
+        SupEquipChargeStatusInfo supEquipChargeStatusInfo = SupEquipChargeStatusInfo.builder()
+                .startChargeSeq(orderInfo.getOrderCode())
+                .startChargeSeqStat(Integer.parseInt(orderStatus))
+                .connectorID(orderInfo.getPileConnectorCode())
+                .connectorStatus(Integer.parseInt(realTimeMonitorData.getConnectorStatus())) // 3-充电中
+                .currentA(current.setScale(1, RoundingMode.HALF_UP))
+                .voltageA(voltage.setScale(1, RoundingMode.HALF_UP))
+                .soc(new BigDecimal(soc))
+                .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime()))
+                .endTime(dateTime)
+                .totalPower(new BigDecimal(realTimeMonitorData.getChargingDegree()))
+
+                .build();
+
+        String url = urlAddress + BusinessInformationExchangeEnum.NOTIFICATION_EQUIP_CHARGE_STATUS.getValue();
+        // 调用平台接口
+        String jsonString = JSON.toJSONString(supEquipChargeStatusInfo);
+
+        // 获取令牌
+        String token = getToken(urlAddress, operatorId, operatorSecret, dataSecretIv, signSecret, dataSecret);
+        String result = HttpRequestUtil.sendPost(token, jsonString, url, dataSecret, dataSecretIv, operatorId, signSecret);
+        return result;
+    }
+
+    /**
+     * 获取广西平台密钥信息
+     *
+     * @return
+     */
+    private ThirdPartySecretInfoVO getGuangXiSecretInfo() {
+        ThirdPartySecretInfoVO thirdPartySecretInfoVO = thirdpartySecretInfoService.queryByThirdPlatformType(thirdPlatformType);
+        if (thirdPartySecretInfoVO == null) {
+            throw new BusinessException(ReturnCodeEnum.CODE_SELECT_INFO_IS_NULL);
+        }
+        thirdPartySecretInfoVO.setOurOperatorId(Constants.OPERATORID_JIANG_SU);
+        return thirdPartySecretInfoVO;
+    }
+}
\ No newline at end of file