交易记录

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

@@ -347,6 +347,7 @@ public class CompanyVO extends PageInfo<CompanyVO> implements Serializable {
      */
     private List<Map<String,Object>> funPackage;
 
+
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -156,6 +156,28 @@ public class Trade  extends PageInfo<Trade> implements Serializable {
      */
     private String tradeStatus;
 
+    /**
+     * @desc   : 活动Id
+     */
+    @ApiModelProperty(value = "活动Id")
+    @Excel(name = "活动Id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String activityId;
+
+    /**
+     * @desc   : 活动明细Id
+     */
+    @ApiModelProperty(value = "活动明细Id")
+    @Excel(name = "活动明细Id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String activityItemId;
+
+
+    /**
+     * @desc   : 交易描述
+     */
+    private String tradeDesc;
+
     /*
      * 相关属性
      * @TableField(exist = false)

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

@@ -134,4 +134,24 @@ public class TradeResponse   {
      */
     private String tradeStatus;
 
+    /**
+     * @desc   : 活动Id
+     */
+    @ApiModelProperty(value = "活动Id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String activityId;
+
+    /**
+     * @desc   : 活动明细Id
+     */
+    @ApiModelProperty(value = "活动明细Id")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String activityItemId;
+
+
+    /**
+     * @desc   : 交易描述
+     */
+    private String tradeDesc;
+
 }

src/main/java/com/dk/oauth/service/impl/CompanyServiceImpl.java

@@ -541,6 +541,11 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
         trade.setExtendDays(companyVO.getExtendDays());
         trade.setBuyGradeCode(companyVO.getGradeCode());
         trade.setTradeStatus(Constant.TradeStatus.INEFFECTIVE.getName());
+        trade.setActivityId(companyVO.getActivityId());
+        trade.setActivityItemId(companyVO.getActivityItemId());
+        trade.setTradeDesc(companyVO.getRemarks());
+        //积分 后期要加字段
+
         tradeMapper.insert(trade);
         return ResponseResultUtil.success(trade);
     }

src/main/resources/mapper/ActivityMapper.xml

@@ -76,6 +76,10 @@
             ti.valid_long  AS "validLong",
             ti.extra_long AS "extraLong",
             T.fun_ids  AS "funUuids",
+            (SELECT json_agg(t.*)  from dkic_a.t_cp_trade t
+            where activity_id = ti.activity_id
+              and activity_item_id = ti.item_id
+               and trade_status = '交易状态-生效' ) AS "trade",
             (SELECT json_agg(m.*)  from sys.t_app_menu m where fun_uuid = ANY(T.fun_ids::uuid[])) AS "funIds",
             T.activity_type AS "activityType"
         FROM

src/main/resources/mapper/TradeMapper.xml

@@ -21,6 +21,10 @@
         ,t.wx_trade_no
         ,t.extend_days
         ,t.dk_user_id
+        ,t.activity_id
+        ,t.trade_status
+        ,t.activity_item_id
+        ,t.trade_desc
     </sql>
 
     <resultMap type="com.dk.oauth.entity.Trade" id="ResultMap">
@@ -39,6 +43,9 @@
         <result column="wx_trade_no" property="wxTradeNo"/>
         <result column="extend_days" property="extendDays"/>
         <result column="dk_user_id" property="dkUserId" typeHandler="UuidTypeHandler"/>
+        <result column="activity_id" property="activityId" typeHandler="UuidTypeHandler"/>
+        <result column="activity_item_id" property="activityItemId" typeHandler="UuidTypeHandler"/>
+        <result column="trade_desc" property="tradeDesc"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -58,6 +65,10 @@
         <result column="wx_trade_no" property="wxtradeNo"/>
         <result column="extend_days" property="extendDays"/>
         <result column="dk_user_id" property="dkUserId" typeHandler="UuidTypeHandler"/>
+        <result column="dk_user_id" property="dkUserId" typeHandler="UuidTypeHandler"/>
+        <result column="activity_id" property="activityId" typeHandler="UuidTypeHandler"/>
+        <result column="activity_item_id" property="activityItemId" typeHandler="UuidTypeHandler"/>
+        <result column="trade_desc" property="tradeDesc"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -81,6 +92,12 @@
             <if test="dkUserId != null  and dkUserId != ''">
                 AND t.dk_user_id = #{dkUserId}::uuid
             </if>
+            <if test="activityId != null  and activityId != ''">
+                AND t.activity_id = #{activityId}::uuid
+            </if>
+            <if test="activityItemId != null  and activityItemId != ''">
+                AND t.activity_item_id = #{activityItemId}::uuid
+            </if>
 
         </where>
     </sql>