Переглянути джерело

fix: 增补DefaultRiskConfig配置信息,null值判断修复

hidewnd 1 місяць тому
батько
коміт
d7c7e7d43e

+ 1 - 1
yt-agent/agent-service/src/main/java/com/ytpm/controller/YtAppUserController.java

@@ -43,7 +43,7 @@ public class YtAppUserController {
     @PostMapping("/getUserList")
     @ApiOperation(value = "查询App用户列表")
     public ResultTable<YtAppUserListView> selectAppUserList(@RequestBody YtAppUserListParam param, @AuthenticationPrincipal AgentUserInfo userInfo) {
-        if (param.getAppType().equals("2")){
+        if ("2".equals(param.getAppType())){
             return appUserService.selectAppUserForIosList(param, userInfo);
         } else {
             return appUserService.selectAppUserList(param, userInfo);

+ 39 - 0
yt-common/src/main/java/com/ytpm/app/model/DefaultRiskConfig.java

@@ -53,4 +53,43 @@ public class DefaultRiskConfig {
     @CustomField(value = "same_field_name", desc = "字段?相同", node = 99)
     @ApiModelProperty("字段?相同")
     private String sameFieldName;
+
+
+    @CustomField(desc = "总预估收益值", node = 2)
+    @ApiModelProperty("总预估收益值")
+    private BigDecimal revenueLimit;
+
+    @CustomField(desc = "总ecpm值", node = 2)
+    @ApiModelProperty("总ecpm值")
+    private BigDecimal ecpmLimit;
+
+    @CustomField(desc = "当日获得?个获得奖励的激励视频", node = 2)
+    @ApiModelProperty("当日获得?个获得奖励的激励视频")
+    private Integer adCompletedCount;
+
+    @CustomField(desc = "最后?个激励视频", node = 2)
+    @ApiModelProperty("最后?个激励视频")
+    private Integer firstCount;
+
+    @CustomField(desc = "平均预估收益值", node = 2)
+    @ApiModelProperty("平均预估收益值")
+    private BigDecimal averageRevenue;
+
+    @CustomField(desc = "?月内", node = 2)
+    @ApiModelProperty("?月内")
+    private Integer monthCount;
+
+    @CustomField(desc = "获得奖励的激励视频个数", node = 2)
+    @ApiModelProperty("获得奖励的激励视频个数")
+    private Integer monthTaskLimit;
+
+    @CustomField(desc = "?小时内", node = 2)
+    @ApiModelProperty("?小时内")
+    private Integer hourCount;
+
+    @CustomField(desc = "获得奖励的激励视频个数", node = 2)
+    @ApiModelProperty("获得奖励的激励视频个数")
+    private Integer hourTaskLimit;
+
+
 }