风控记录&解封记录增加渠道ID 加盟商ID

yt-common/src/main/java/com/ytpm/agent/model/YtPlatformBanned.java

@@ -15,6 +15,7 @@ import java.util.Date;
 public class YtPlatformBanned {
     private String bannedId;
     private String userId;
+    private String agentId;
     private String appId;
     private String channelId;
     private Date bannedTime;

yt-common/src/main/java/com/ytpm/agent/model/YtPlatformDeblocking.java

@@ -23,6 +23,8 @@ public class YtPlatformDeblocking {
     private String appId;
     @ApiModelProperty("渠道ID")
     private String channelId;
+    @ApiModelProperty("加盟商ID")
+    private String agentId;
     @ApiModelProperty("解禁时间")
     private Date deblockingTime;
     @ApiModelProperty("解禁原因")

yt-common/src/main/java/com/ytpm/risk/param/RiskBannedListParam.java

@@ -20,6 +20,8 @@ public class RiskBannedListParam extends PageMeta {
     private String channelId;
     @ApiModelProperty("应用ID")
     private String appId;
+    @ApiModelProperty("加盟商ID")
+    private String agentId;
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")

yt-common/src/main/java/com/ytpm/risk/param/RiskBannedParam.java

@@ -29,4 +29,6 @@ public class RiskBannedParam {
     private String appId;
     @ApiModelProperty("渠道ID")
     private Long ditChId;
+    @ApiModelProperty("加盟商ID")
+    private String agentId;
 }

yt-common/src/main/java/com/ytpm/risk/param/RiskDeblockingListParam.java

@@ -32,6 +32,8 @@ public class RiskDeblockingListParam extends PageMeta {
     private String appId;
     @ApiModelProperty("渠道ID")
     private String channelId;
+    @ApiModelProperty("加盟商ID")
+    private String agentId;
     @ApiModelProperty("渠道类型")
     private Integer channelType;
     @ApiModelProperty("渠道来源")

yt-common/src/main/java/com/ytpm/risk/param/RiskUserStatusParam.java

@@ -13,6 +13,10 @@ import lombok.NoArgsConstructor;
 public class RiskUserStatusParam {
     @ApiModelProperty("用户ID")
     private String userId;
+    @ApiModelProperty("应用ID")
+    private String appId;
+    @ApiModelProperty("加盟商ID")
+    private String agentId;
     @ApiModelProperty("用户状态")
     private Integer userStatus;
     @ApiModelProperty("原因")

yt-risk/risk-manage/src/main/java/com/ytpm/controller/RiskManageController.java

@@ -72,6 +72,7 @@ public class RiskManageController {
     public Result<?> banned(@RequestBody RiskBannedParam param, @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
         param.setOperator(userInfo.getUserId());
         param.setOperatorName(userInfo.getNickName());
+        param.setAgentId(userInfo.getUserId());
         return riskService.banned(param);
     }
 
@@ -81,7 +82,7 @@ public class RiskManageController {
     @ApiOperation("查询风控用户记录")
     @PostMapping("/bannedList")
     public ResultTable<RiskBannedListView> bannedList(@RequestBody RiskBannedListParam param, @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
-        param.setChannelId(userInfo.getUserId());
+        param.setAgentId(userInfo.getUserId());
         return riskService.bannedList(param);
     }
 
@@ -91,7 +92,7 @@ public class RiskManageController {
     @ApiOperation("查询解封记录")
     @PostMapping("/deblockingList")
     public ResultTable<RiskDeblockingListView> deblockingList(@RequestBody RiskDeblockingListParam param, @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
-        param.setChannelId(userInfo.getUserId());
+        param.setAgentId(userInfo.getUserId());
         return riskService.deblockingList(param);
     }
 
@@ -103,6 +104,7 @@ public class RiskManageController {
     public Result<?> changeUserStatus(@RequestBody RiskUserStatusParam param, @ApiIgnore @AuthenticationPrincipal AgentUserInfo userInfo) {
         param.setOperator(userInfo.getUserId());
         param.setOperatorName(userInfo.getNickName());
+        param.setAgentId(userInfo.getUserId());
         return riskService.changeUserStatus(param);
     }
 

yt-risk/risk-manage/src/main/java/com/ytpm/service/impl/RiskServiceImpl.java

@@ -200,6 +200,7 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
         param.setBannedReason(BannedTypeEnum.CHANNEL.getDesc()+"禁止登录");
         param.setOperatorName(userInfo.getNickName());
         param.setOperator(userInfo.getUserId());
+        param.setAgentId(userInfo.getUserId());
         param.setBannedType(BannedTypeEnum.CHANNEL.getCode());
         addBannedRecord(Collections.singletonList(user.getUserId()),param);
         return Result.resultOk(RepMessage.LOCK_USER_SUCCESS);
@@ -588,8 +589,7 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
             default: //解禁
                 YtPlatformBanned banned = riskManageMapper.getLastBanned(user.getUserId());
                 if(Objects.nonNull(banned)){
-                    addDeblockingRecord(banned.getBannedId(),banned.getAppId(),user.getUserId(),param.getOperator()
-                            ,param.getReason(),param.getOperatorName());
+                    addDeblockingRecord(banned,param);
                 }
         }
         appFeign.updateUserInfo(appUser);
@@ -598,17 +598,17 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
     /**
      * 增加解禁记录
      */
-    private void addDeblockingRecord(String bannedId, String appId, String userId, String operator, String reason, String operatorName) {
+    private void addDeblockingRecord(YtPlatformBanned banned, RiskUserStatusParam param) {
         YtPlatformDeblocking deblocking = new YtPlatformDeblocking();
         deblocking.setDeblockingId(IdUtil.fastSimpleUUID());
-        deblocking.setUserId(userId);
-        deblocking.setAppId(appId);
-        deblocking.setOperator(operator);
-        deblocking.setOperatorName(operatorName);
-        deblocking.setBannedId(bannedId);
-        deblocking.setDeblockingReason(reason);
+        deblocking.setUserId(banned.getUserId());
+        deblocking.setAppId(banned.getAppId());
+        deblocking.setAgentId(param.getAgentId());
+        deblocking.setOperator(param.getOperator());
+        deblocking.setOperatorName(param.getOperatorName());
+        deblocking.setBannedId(banned.getBannedId());
+        deblocking.setDeblockingReason(param.getReason());
         deblocking.setDeblockingTime(new Date());
-        deblocking.setChannelId(operator);
         riskManageMapper.addDeblockingRecord(deblocking);
     }
 
@@ -622,7 +622,10 @@ public class RiskServiceImpl extends ReflectUtil implements RiskService {
             banned.setBannedId(IdUtil.fastSimpleUUID());
             banned.setUserId(userId);
             banned.setAppId(param.getAppId());
-            banned.setChannelId(param.getDitChId().toString());
+            banned.setAgentId(param.getAgentId());
+            if(Objects.nonNull(param.getDitChId())){
+                banned.setChannelId(param.getDitChId().toString());
+            }
             banned.setBannedLimit(Objects.isNull(param.getBannedLimit())?defaultLimit:param.getBannedLimit());
             banned.setBannedReason(StrUtil.isBlank(param.getBannedReason())?defaultReason:param.getBannedReason());
             banned.setBannedType(BannedTypeEnum.CHANNEL.getCode());

yt-risk/risk-manage/src/main/resources/mapper/RiskManageMapper.xml

@@ -9,6 +9,7 @@
          user_id,
          app_id,
          channel_id,
+         agent_id,
          deblocking_time,
          deblocking_reason,
          operator,
@@ -21,6 +22,7 @@
          #{userId},
          #{appId},
          #{channelId},
+         #{agentId},
          #{deblockingTime},
          #{deblockingReason},
          #{operator},
@@ -57,6 +59,7 @@
             pd.deblocking_id,
             pd.banned_id,
             pd.user_id,
+            pd.agent_id,
             pd.channel_id,
             pd.deblocking_time,
             pd.deblocking_reason,
@@ -68,7 +71,7 @@
             yt_platform_deblocking pd
             JOIN yt_app a ON pd.app_id = a.app_id
         WHERE
-            pd.channel_id = #{channelId}
+            pd.agent_id = #{agentId}
         <if test="appId != null and appId != ''">
             and a.app_id = #{appId}
         </if>
@@ -87,30 +90,21 @@
     <select id="getBannedList" resultType="com.ytpm.risk.view.RiskBannedListView">
         SELECT
         pb.banned_id,
-#         au.platform_id,
-#         au.channel_id,
-#         au.user_id,
-#         au.nick_name,
-#         au.registry_time,
-#         au.last_login_ip,
-#         au.last_login_time,
-#         au.user_status,
         pb.banned_time,
         pb.banned_reason,
-#         au.channel_type,
-#         au.channel_origin,
         pb.banned_type,
         pb.banned_limit,
         pb.operator,
         pb.operator_name,
         pb.user_id,
+        pb.agent_id,
         a.app_id,
         a.app_name
         FROM
         yt_platform_banned pb
         JOIN yt_app a ON pb.app_id = a.app_id
         WHERE
-        pb.channel_id = #{channelId}
+        pb.agent_id = #{agentId}
         <if test="appId != null and appId != ''">
             and a.app_id = #{appId}
         </if>
@@ -127,7 +121,7 @@
     </select>
     <select id="getLastBanned" resultType="com.ytpm.agent.model.YtPlatformBanned">
         select
-            banned_id, app_id, user_id, channel_id, banned_time, banned_reason, banned_type, banned_limit, operator, operator_name
+            banned_id, app_id, user_id, channel_id,agent_id, banned_time, banned_reason, banned_type, banned_limit, operator, operator_name
         from yt_platform_banned
         where user_id = #{userId}
         order by banned_time desc
@@ -136,7 +130,7 @@
 
     <select id="queryBannedRecord" resultType="com.ytpm.agent.model.YtPlatformBanned">
         select
-        banned_id, user_id, channel_id, banned_time, banned_reason, banned_type, banned_limit, operator, operator_name
+        banned_id, user_id, channel_id,agent_id, banned_time, banned_reason, banned_type, banned_limit, operator, operator_name
         from yt_platform_banned
         <where>
             <if test="startTime != null">

yt-risk/risk-manage/src/main/resources/mapper/RiskUserMapper.xml

@@ -7,6 +7,7 @@
          banned_id,
          user_id,
          app_id,
+         agent_id,
          channel_id,
          banned_time,
          banned_reason,
@@ -20,6 +21,7 @@
             #{bannedId},
             #{userId},
             #{appId},
+            #{agentId},
             #{channelId},
             #{bannedTime},
             #{bannedReason},