加字段

2026-04-20 11:05:18 +08:00 · 2024-01-14 14:44:14 +08:00
parent 687f97fc88
commit d490d9d5b0
3 changed files with 248 additions and 291 deletions
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
@@ -1,252 +1,210 @@
 package com.jsowell.pile.domain;

-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jsowell.common.annotation.Excel;
-import com.jsowell.common.core.domain.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
 import java.math.BigDecimal;
 import java.util.Date;
-import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;

 /**
- * 订单对象 order_basic_info
- *
- * @author jsowell
- * @date 2022-09-30
+ * 订单主表
 */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
+@Getter
+@Setter
@Builder
-public class OrderBasicInfo extends BaseEntity {
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 主键
-	 */
-	private Long id;
-
-	/**
-	 * 订单编号
-	 */
-	@Excel(name = "订单编号")
-	private String orderCode;
-
-	/**
-	 * 交易流水号
-	 */
-	private String transactionCode;
-
-	/**
-	 * 订单状态(0-待支付；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成)
-	 */
-	@Excel(name = "订单状态")
-	private String orderStatus;
-
-	/**
-	 * 会员id
-	 */
-	@Excel(name = "会员id")
-	private String memberId;
-
-	/**
-	 * 站点id
-	 */
-	@Excel(name = "站点id")
-	private String stationId;
-
-	/**
-	 * 运营商id
-	 */
-	@Excel(name = "运营商id")
-	private String merchantId;
-
-	/**
-	 * 充电桩sn号
-	 */
-	@Excel(name = "充电桩sn号")
-	private String pileSn;
-
-	/**
-	 * 充电桩枪口号
-	 */
-	@Excel(name = "充电桩枪口号")
-	private String connectorCode;
-
-	/**
-	 * 充电桩枪口编号
-	 */
-	@Excel(name = "充电桩枪口编号")
-	private String pileConnectorCode;
-
-	/**
-	 * 逻辑卡号
-	 */
-	@Excel(name = "逻辑卡号")
-	private String logicCard;
-
-	/**
-	 * 车辆vin码
-	 */
-	@Excel(name = "车辆vin码")
-	private String vinCode;
-
-	/**
-	 * 启动方式
-	 * 0-后管启动；1-用户app启动
-	 */
-	@Excel(name = "启动方式")
-	private String startMode;
-
-	/**
-	 * 第三方平台类型
-	 */
-	@Excel(name = "第三方平台类型")
-	private String thirdPartyType;
-
-	/**
-	 * 支付方式
-	 * 1-余额支付；3-白名单支付; 4-微信支付；5-支付宝支付；
-	 */
-	@Excel(name = "支付方式")
-	private String payMode;
-
-	/**
-	 * 支付状态
-	 * 0-待支付；1-支付完成
-	 */
-	@Excel(name = "支付状态")
-	private String payStatus;
-
-	/**
-	 * 支付金额
-	 * 指用户本次需要充电的金额
-	 */
-	@Excel(name = "支付金额")
-	private BigDecimal payAmount;
-
-	/**
-	 * 支付时间
-	 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@Excel(name = "支付时间", width = 30, dateFormat = "yyyy-MM-dd")
-	private Date payTime;
-
-	/**
-	 * 车牌号码
-	 */
-	private String plateNumber;
-
-	/**
-	 * 订单总金额 = 电费总金额 + 服务费总金额
-	 */
-	@Excel(name = "订单总金额")
-	private BigDecimal orderAmount;
-
-	/**
-	 * 虚拟金额
-	 */
-	@Excel(name = "虚拟金额")
-	private BigDecimal virtualAmount;
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderBasicInfo {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    private Integer id;

    /**
-     * 折扣金额
+     * 订单编号
+     */
+    private String orderCode;
+
+    /**
+     * 交易流水号
+     */
+    private String transactionCode;
+
+    /**
+     * 订单状态(0-未启动；1-充电中；2-待结算；3-待补缴；4-异常；5-可疑；6-订单完成；7-超时关闭)
+     */
+    private String orderStatus;
+
+    /**
+     * 会员id
+     */
+    private String memberId;
+
+    /**
+     * 站点id
+     */
+    private String stationId;
+
+    /**
+     * 运营商id
+     */
+    private String merchantId;
+
+    /**
+     * 充电桩sn
+     */
+    private String pileSn;
+
+    /**
+     * 充电桩枪口号
+     */
+    private String connectorCode;
+
+    /**
+     * 充电桩枪口编号
+     */
+    private String pileConnectorCode;
+
+    /**
+     * 卡启动时的卡号
+     */
+    private String logicCard;
+
+    /**
+     * vin启动时的vin码
+     */
+    private String vinCode;
+
+    /**
+     * 启动方式（0-后管启动；1-用户app启动；2-卡启动；3-离线卡启动; 4-联联平台启动; 5-车辆vin码启动）
+     */
+    private String startMode;
+
+    /**
+     * 支付方式(1-余额支付；3-白名单支付；4-微信支付；5-支付宝支付)
+     */
+    private String payMode;
+
+    /**
+     * 支付状态(0-待支付；1-支付完成)
+     */
+    private String payStatus;
+
+    /**
+     * 支付金额（指用户预存的金额）
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+
+    /**
+     * 车牌号码
+     */
+    private String plateNumber;
+
+    /**
+     * 订单总金额 = 电费总金额 + 服务费总金额
+     */
+    private BigDecimal orderAmount;
+
+    /**
+     * 虚拟金额（指使用赠送余额消费部分）
+     */
+    private BigDecimal virtualAmount;
+
+    /**
+     * 会员组编号
+     */
+    private String groupCode;
+
+    /**
+     * 折扣金额（指会员优惠金额）
     */
-    @Excel(name = "折扣金额")
    private BigDecimal discountAmount;

-	/**
-	 * 结算金额
-	 */
-	@Excel(name = "结算金额")
-	private BigDecimal settleAmount;
+    /**
+     * 结算金额（指实际产生的消费，包括本金支付，微信支付等）
+     */
+    private BigDecimal settleAmount;

-	/**
-	 * 充电开始时间
-	 */
-	private Date chargeStartTime;
+    /**
+     * 充电开始时间
+     */
+    private Date chargeStartTime;

-	/**
-	 * 充电结束时间
-	 */
-	private Date chargeEndTime;
+    /**
+     * 充电结束时间
+     */
+    private Date chargeEndTime;

-	/**
-	 * 启动类型
-	 */
-	private String startType;
+    /**
+     * 启动类型（now-立即启动；appointment-预约启动）
+     */
+    private String startType;

-	/**
-	 * 预约时间
-	 */
-	private Date appointmentTime;
+    /**
+     * 预约时间
+     */
+    private Date appointmentTime;

-	/**
-	 * 开始SOC
-	 */
-	private String startSoc;
+    /**
+     * 开始SOC
+     */
+    private String startSoc;

-	/**
-	 * 结束SOC
-	 */
-	private String endSoc;
+    /**
+     * 结束SOC
+     */
+    private String endSoc;

-	/**
-	 * 异常原因
-	 */
-	private String reason;
+    /**
+     * 异常原因
+     */
+    private String reason;

-	/**
-	 * 结算时间
-	 */
-	private Date settlementTime;
+    /**
+     * 结算时间
+     */
+    private Date settlementTime;

-	/**
-	 * 退款金额
-	 */
-	private BigDecimal refundAmount;
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;

    /**
     * 退款状态（0-不需要退款；1-退款中；2-退款完成）
     */
    private String refundStatus;

-	/**
-	 * 删除标识（0-正常；1-删除）
-	 */
-	private String delFlag;
+    /**
+     * 创建人
+     */
+    private String createBy;

-	private List<OrderDetail> orderDetailList;
+    /**
+     * 创建时间
+     */
+    private Date createTime;

-	@Override
-	public String toString() {
-		return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
-				.append("id", id)
-				.append("orderCode", orderCode)
-				.append("orderStatus", orderStatus)
-				.append("memberId", memberId)
-				.append("stationId", stationId)
-				.append("pileSn", pileSn)
-				.append("connectorCode", connectorCode)
-				.append("startMode", startMode)
-				.append("payMode", payMode)
-				.append("payStatus", payStatus)
-				.append("payAmount", payAmount)
-				.append("payTime", payTime)
-				.append("orderAmount", orderAmount)
-				.append("chargeStartTime", chargeStartTime)
-				.append("chargeEndTime", chargeEndTime)
-				.append("startSOC", startSoc)
-				.append("endSOC", endSoc)
-				.append("reason", reason)
-				.append("delFlag", delFlag)
-				.append("orderDetailList", orderDetailList)
-				.toString();
-	}
-}
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 删除标识（0-正常；1-删除）
+     */
+    private String delFlag;
+}
--- 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,6 +1,10 @@
 package com.jsowell.pile.mapper;

 import com.jsowell.pile.domain.OrderBasicInfo;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
 import com.jsowell.pile.domain.OrderDetail;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
@@ -13,12 +17,7 @@ import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
 import com.jsowell.pile.vo.uniapp.SendMessageVO;
 import com.jsowell.pile.vo.web.*;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;

-import java.time.LocalDateTime;
-import java.util.List;
-
-@Repository
 public interface OrderBasicInfoMapper {
    /**
     * delete by primary key
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -17,7 +17,6 @@
    <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" />
@@ -25,6 +24,7 @@
    <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="charge_start_time" jdbcType="TIMESTAMP" property="chargeStartTime" />
@@ -46,9 +46,9 @@
  <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, discount_amount, 
-    settle_amount, charge_start_time, charge_end_time, start_type, appointment_time, 
+    pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, pay_mode, 
+    pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, group_code, 
+    discount_amount, settle_amount, charge_start_time, charge_end_time, start_type, appointment_time, 
    start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, create_by, 
    create_time, update_by, update_time, del_flag
  </sql>
@@ -69,29 +69,29 @@
    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,
+      logic_card, vin_code, start_mode, 
      pay_mode, pay_status, pay_amount, 
      pay_time, plate_number, order_amount, 
-      virtual_amount, discount_amount, settle_amount, 
-      charge_start_time, charge_end_time, start_type, 
-      appointment_time, start_soc, end_soc, 
-      reason, settlement_time, refund_amount, 
-      refund_status, create_by, create_time, 
-      update_by, update_time, del_flag
-      )
+      virtual_amount, group_code, discount_amount, 
+      settle_amount, charge_start_time, charge_end_time, 
+      start_type, appointment_time, start_soc, 
+      end_soc, 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},
+      #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, 
      #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, 
      #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, 
-      #{virtualAmount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, 
-      #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR}, 
-      #{appointmentTime,jdbcType=TIMESTAMP}, #{startSoc,jdbcType=VARCHAR}, #{endSoc,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}
-      )
+      #{virtualAmount,jdbcType=DECIMAL}, #{groupCode,jdbcType=VARCHAR}, #{discountAmount,jdbcType=DECIMAL}, 
+      #{settleAmount,jdbcType=DECIMAL}, #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, 
+      #{startType,jdbcType=VARCHAR}, #{appointmentTime,jdbcType=TIMESTAMP}, #{startSoc,jdbcType=VARCHAR}, 
+      #{endSoc,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-->
@@ -133,9 +133,6 @@
      <if test="startMode != null">
        start_mode,
      </if>
-      <if test="thirdPartyType != null">
-        third_party_type,
-      </if>
      <if test="payMode != null">
        pay_mode,
      </if>
@@ -157,6 +154,9 @@
      <if test="virtualAmount != null">
        virtual_amount,
      </if>
+      <if test="groupCode != null">
+        group_code,
+      </if>
      <if test="discountAmount != null">
        discount_amount,
      </if>
@@ -246,9 +246,6 @@
      <if test="startMode != null">
        #{startMode,jdbcType=VARCHAR},
      </if>
-      <if test="thirdPartyType != null">
-        #{thirdPartyType,jdbcType=VARCHAR},
-      </if>
      <if test="payMode != null">
        #{payMode,jdbcType=VARCHAR},
      </if>
@@ -270,6 +267,9 @@
      <if test="virtualAmount != null">
        #{virtualAmount,jdbcType=DECIMAL},
      </if>
+      <if test="groupCode != null">
+        #{groupCode,jdbcType=VARCHAR},
+      </if>
      <if test="discountAmount != null">
        #{discountAmount,jdbcType=DECIMAL},
      </if>
@@ -363,9 +363,6 @@
      <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>
@@ -387,6 +384,9 @@
      <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>
@@ -456,7 +456,6 @@
      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},
@@ -464,6 +463,7 @@
      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},
      charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
@@ -547,11 +547,6 @@
          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}
@@ -587,6 +582,11 @@
          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}
@@ -766,13 +766,6 @@
          </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">
@@ -822,6 +815,13 @@
          </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">
@@ -951,20 +951,20 @@
    <!--@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,
+      pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, 
      pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, 
-      discount_amount, settle_amount, charge_start_time, charge_end_time, start_type, 
-      appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, 
-      create_by, create_time, update_by, update_time, del_flag)
+      group_code, discount_amount, settle_amount, charge_start_time, charge_end_time, 
+      start_type, appointment_time, start_soc, end_soc, 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.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,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.discountAmount,jdbcType=DECIMAL}, 
+        #{item.virtualAmount,jdbcType=DECIMAL}, #{item.groupCode,jdbcType=VARCHAR}, #{item.discountAmount,jdbcType=DECIMAL}, 
        #{item.settleAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, 
        #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR}, #{item.appointmentTime,jdbcType=TIMESTAMP}, 
        #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR}, 
@@ -993,7 +993,6 @@
      logic_card,
      vin_code,
      start_mode,
-      third_party_type,
      pay_mode,
      pay_status,
      pay_amount,
@@ -1001,6 +1000,7 @@
      plate_number,
      order_amount,
      virtual_amount,
+      group_code,
      discount_amount,
      settle_amount,
      charge_start_time,
@@ -1036,7 +1036,6 @@
      #{logicCard,jdbcType=VARCHAR},
      #{vinCode,jdbcType=VARCHAR},
      #{startMode,jdbcType=VARCHAR},
-      #{thirdPartyType,jdbcType=VARCHAR},
      #{payMode,jdbcType=VARCHAR},
      #{payStatus,jdbcType=VARCHAR},
      #{payAmount,jdbcType=DECIMAL},
@@ -1044,6 +1043,7 @@
      #{plateNumber,jdbcType=VARCHAR},
      #{orderAmount,jdbcType=DECIMAL},
      #{virtualAmount,jdbcType=DECIMAL},
+      #{groupCode,jdbcType=VARCHAR},
      #{discountAmount,jdbcType=DECIMAL},
      #{settleAmount,jdbcType=DECIMAL},
      #{chargeStartTime,jdbcType=TIMESTAMP},
@@ -1079,7 +1079,6 @@
      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},
@@ -1087,6 +1086,7 @@
      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},
      charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP},
@@ -1149,9 +1149,6 @@
      <if test="startMode != null">
        start_mode,
      </if>
-      <if test="thirdPartyType != null">
-        third_party_type,
-      </if>
      <if test="payMode != null">
        pay_mode,
      </if>
@@ -1173,6 +1170,9 @@
      <if test="virtualAmount != null">
        virtual_amount,
      </if>
+      <if test="groupCode != null">
+        group_code,
+      </if>
      <if test="discountAmount != null">
        discount_amount,
      </if>
@@ -1266,9 +1266,6 @@
      <if test="startMode != null">
        #{startMode,jdbcType=VARCHAR},
      </if>
-      <if test="thirdPartyType != null">
-        #{thirdPartyType,jdbcType=VARCHAR},
-      </if>
      <if test="payMode != null">
        #{payMode,jdbcType=VARCHAR},
      </if>
@@ -1290,6 +1287,9 @@
      <if test="virtualAmount != null">
        #{virtualAmount,jdbcType=DECIMAL},
      </if>
+      <if test="groupCode != null">
+        #{groupCode,jdbcType=VARCHAR},
+      </if>
      <if test="discountAmount != null">
        #{discountAmount,jdbcType=DECIMAL},
      </if>
@@ -1383,9 +1383,6 @@
      <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>
@@ -1407,6 +1404,9 @@
      <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>
@@ -1622,12 +1622,12 @@
            and t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
        </if>
        <!-- 数据范围过滤 -->
-        <!--        &lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&gt;-->
+        <!--        &amp;lt;if test="merchantDeptIds != null and merchantDeptIds.size() != 0"&amp;gt;-->
        <!--            and t3.dept_id in-->
-        <!--            &lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&gt;-->
+        <!--            &amp;lt;foreach collection="merchantDeptIds" item="merchantDeptId" open="(" separator="," close=")"&amp;gt;-->
        <!--                #{merchantDeptId}-->
-        <!--            &lt;/foreach&gt;-->
-        <!--        &lt;/if&gt;-->
+        <!--            &amp;lt;/foreach&amp;gt;-->
+        <!--        &amp;lt;/if&amp;gt;-->
        <if test="stationDeptIds != null and stationDeptIds.size() != 0">
            and t3.dept_id in
            <foreach close=")" collection="stationDeptIds" item="stationDeptId" open="(" separator=",">