发票

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

@@ -89,6 +89,7 @@
         <result column="integral" property="integral"/>
         <result column="staff_name" property="staffName"/>
         <result column="coupon_name" property="couponName"/>
+        <result column="discount" property="discount"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -156,6 +157,7 @@
         ,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