Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss-server-oauth

src/main/java/com/dk/oauth/entity/Trade.java

@@ -72,6 +72,13 @@ public class Trade extends PageInfo<Trade> implements Serializable {
     private BigDecimal tradeAmount;
 
     /**
+     * 订单金额
+     */
+    @Excel(name = "订单金额")
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal orderAmount;
+
+    /**
      * 交易时间
      */
     @Excel(name = "交易时间")

src/main/java/com/dk/oauth/entity/TradeResponse.java

@@ -203,4 +203,11 @@ public class TradeResponse   {
     @Excel(name = "优惠券名称")
     @ApiModelProperty(value = "优惠券名称")
     private String couponName;
+
+    /**
+     * 整单折扣
+     */
+    @Excel(name = "整单折扣")
+    @ApiModelProperty(value = "整单折扣")
+    private BigDecimal discount;
 }

src/main/resources/mapper/TradeMapper.xml

@@ -31,6 +31,7 @@
         ,t.coupon_use_id
         ,t.integral
         ,t.staff_name
+        ,t.order_amount
     </sql>
 
     <resultMap type="com.dk.oauth.entity.Trade" id="ResultMap">
@@ -39,6 +40,7 @@
         <result column="trade_no" property="tradeNo"/>
         <result column="wx_user_id" property="wxUserId" typeHandler="UuidTypeHandler"/>
         <result column="trade_amount" property="tradeAmount"/>
+        <result column="order_amount" property="orderAmount"/>
         <result column="trade_time" property="tradeTime" typeHandler="TimestampTypeHandler"/>
         <result column="trade_type" property="tradeType"/>
         <result column="buy_long" property="buyLong"/>
@@ -89,6 +91,7 @@
         <result column="integral" property="integral"/>
         <result column="staff_name" property="staffName"/>
         <result column="coupon_name" property="couponName"/>
+        <result column="discount" property="discount"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -155,13 +158,13 @@
         ,sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n} ) AS "tradeTypeName"
         ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n} ) AS "tradeStatusName"
         ,sys.f_get_name_i18n(tdk3.kind_name_i18n, #{i18n} ) AS "receiptStatusName"
-        ,tmc.coupon_name
+        ,tmc.discount
         FROM dkic_a.t_cp_trade t
         left join sys.t_grade g on t.buy_grade_code = g.grade_code
         LEFT JOIN sys.t_data_kind tdk1 ON tdk1.kind_code = t.trade_type
         LEFT JOIN sys.t_data_kind tdk2 ON tdk2.kind_code = t.trade_status
         LEFT JOIN sys.t_data_kind tdk3 ON tdk3.kind_code = t.receipt_status
-        LEFT JOIN dkic_a.t_mst_coupon tmc ON tmc.coupon_id = t.coupon_use_id
+        LEFT JOIN dkic_a.t_mst_coupon_use tmc ON tmc.use_id = t.coupon_use_id
         <include refid="Condition"/>
         order by t.trade_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">