Merge remote-tracking branch 'origin/dev' into dev

alien-entity/src/main/java/shop/alien/entity/store/LifeUserExpertWorks.java

@@ -96,4 +96,7 @@ public class LifeUserExpertWorks extends Model<LifeUserExpertWorks> {
     @TableField(value = "dynamics_id")
     private Integer dynamicsId;
 
+    @ApiModelProperty(value = "实际gmv")
+    @TableField(value = "real_order_gmv")
+    private BigDecimal realOrderGmv;
 }

alien-entity/src/main/resources/mapper/LifeUserExpertWorksMapper.xml

@@ -14,11 +14,18 @@
         <result column="created_user_id" property="createdUserId" />
         <result column="updated_time" property="updatedTime" />
         <result column="updated_user_id" property="updatedUserId" />
+        <result column="order_gmv" property="orderGmv" />
+        <result column="real_order_gmv" property="realOrderGmv" />
+        <result column="introduction" property="introduction" />
+        <result column="like_count" property="likeCount" />
+        <result column="comment_count" property="commentCount" />
+        <result column="share_count" property="shareCount" />
+        <result column="dynamics_id" property="dynamicsId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, expert_id, order_id, works_url, play_count, delete_flag, created_time, created_user_id, updated_time, updated_user_id
+        id, expert_id, order_id, works_url, play_count, delete_flag, created_time, created_user_id, updated_time, updated_user_id, order_gmv, real_order_gmv, introduction, like_count, comment_count, share_count, dynamics_id
     </sql>
 
 </mapper>

alien-second/src/main/java/shop/alien/second/service/impl/SecondTradeRecordServiceImpl.java

@@ -282,6 +282,7 @@ public class SecondTradeRecordServiceImpl extends ServiceImpl<SecondTradeRecordM
                 SecondRiskControlRecord riskControlRecord = new SecondRiskControlRecord();
                 riskControlRecord.setRuleType(1);
                 riskControlRecord.setUserId(trade.getSellerId());
+                riskControlRecord.setBusinessId(String.valueOf(trade.getSellerId()));
                 riskControlRecord.setRuleName(riskControlProperties.getMoneyLaundering().getRiskType());
                 JSONArray detailInfo = new JSONArray();
                 detailInfo.addAll(recordList.stream().map(SecondTradeRecord::getId).collect(Collectors.toList()));