订单表添加字段：优惠方式

entity/src/main/java/com/kym/entity/miniapp/ChargeOrder.java

@@ -118,6 +118,11 @@ public class ChargeOrder extends BaseEntity implements Serializable {
      */
     private Integer payAmount;
 
+    /**
+     * 优惠方式：RechargeRights-充值权益 Coupon-优惠券
+     */
+    private String discountType;
+
     /**
      * 优惠金额（分）
      */

mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -17,6 +17,11 @@
         <result column="total_money" property="totalMoney"/>
         <result column="elec_money" property="elecMoney"/>
         <result column="service_money" property="serviceMoney"/>
+        <result column="pay_amount" property="payAmount"/>
+        <result column="discount_type" property="discountType"/>
+        <result column="discount_amount" property="discountAmount"/>
+        <result column="service_money_discount" property="serviceMoneyDiscount"/>
+        <result column="pay_service_amount" property="payServiceAmount"/>
         <result column="sum_period" property="sumPeriod"/>
         <result column="charge_detail" property="chargeDetail"/>
         <result column="order_status" property="orderStatus"/>
@@ -42,6 +47,7 @@
         <result column="elec_money" property="elecMoney"/>
         <result column="service_money" property="serviceMoney"/>
         <result column="pay_amount" property="payAmount"/>
+        <result column="discount_type" property="discountType"/>
         <result column="discount_amount" property="discountAmount"/>
         <result column="service_money_discount" property="serviceMoneyDiscount"/>
         <result column="pay_service_amount" property="payServiceAmount"/>
@@ -66,7 +72,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, user_id, station_id, start_charge_seq, connector_id, is_booking,start_time, end_time, soc, total_power, total_money, elec_money, service_money,pay_amount,discount_amount,service_money_discount, sum_period, charge_detail, order_status, charge_status, stop_reason, invoice_status,invoice_id,create_time, update_time
+        id, user_id, station_id, start_charge_seq, connector_id, is_booking,start_time, end_time, soc, total_power, total_money, elec_money, service_money,pay_amount,discount_type,discount_amount,service_money_discount, sum_period, charge_detail, order_status, charge_status, stop_reason, invoice_status,invoice_id,create_time, update_time
     </sql>
 
     <select id="statChargeOrders" resultType="java.util.Map"