积分消费记录关联更新

src/main/java/com/dk/oauth/mapper/integral/IntegralItemMapper.xml

@@ -40,6 +40,7 @@
         <result column="flg_valid" property="flgValid"/>
         <result column="user_id" property="userId" typeHandler="UuidTypeHandler"/>
         <result column="staff_name" property="staffName"/>
+        <result column="trade_type" property="tradeType"/>
         <result column="remarks" property="remarks"/>
     </resultMap>
 
@@ -108,10 +109,13 @@
         ,tac.cp_name
         ,tacf.cp_name as cp_name_from,
         sys.f_get_name_i18n(tdk.kind_name_i18n,#{i18n}) as integral_type_name
+        ,sys.f_get_name_i18n(tdk2.kind_name_i18n, #{i18n}) as "trade_type"
         FROM dkic_a.t_mst_integral_item tmii
         LEFT JOIN sys.t_data_kind tdk ON tmii.integral_type = tdk.kind_code
         left join dkic_a.t_a_company tac on tac.cp_id = tmii.cp_id
         left join dkic_a.t_a_company tacf on tacf.cp_id = tmii.cp_id
+        left join dkic_a.t_cp_trade tct on tct.integral_share_id = tmii.item_id
+        left join sys.t_data_kind tdk2 ON tct.trade_type = tdk2.kind_code
         <include refid="Condition"/>
         order by tmii.acc_date desc, tmii.user_id
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">

src/main/java/com/dk/oauth/model/response/integral/IntegralItemResponse.java

@@ -115,6 +115,12 @@ public class IntegralItemResponse{
     @ApiModelProperty(value = "操作员工")
     private String staffName;
 
+    /**
+     * 交易类型
+     */
+    @Excel(name = "交易类型")
+    @ApiModelProperty(value = "交易类型")
+    private String tradeType;
     /*
      * 相关属性
      * @TableField(exist = false)