feat:小说服务逻辑调整

yt-common/src/main/java/com/ytpm/app/model/YtDyzAdRecord.java

@@ -52,4 +52,7 @@ public class YtDyzAdRecord extends ComprehensiveCommonView {
     private String appId;
     @ApiModelProperty("登陆前/登陆后")
     private Integer loginStatus;
+
+    @ApiModelProperty("用户收益比例")
+    private String revenueRate;
 }

yt-common/src/main/java/com/ytpm/app/model/YtDyzUser.java

@@ -1,8 +1,6 @@
 package com.ytpm.app.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.DateSerializer;
 import com.ytpm.app.enums.LoginType;
 import com.ytpm.custom.CustomField;
 import com.ytpm.handle.BigDecimalSerialize;
@@ -40,13 +38,9 @@ public class YtDyzUser extends YtUser {
     /** 注册时间 */
     @CustomField(node = 1)
     @ApiModelProperty("注册时间")
-    @JsonSerialize(using = DateSerializer.class)
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:dd")
     private Date registryTime;
     /** 最新登录时间 */
     @ApiModelProperty("最新登录时间")
-    @JsonSerialize(using = DateSerializer.class)
-    @JsonFormat(pattern = "yyyy-MM-dd hh:mm:dd")
     private Date lastLoginTime;
     /** 注册时间 */
     @CustomField(node = 1)

yt-common/src/main/java/com/ytpm/app/model/YtNovelAdRecord.java

@@ -31,7 +31,4 @@ public class YtNovelAdRecord {
     @ApiModelProperty("红包收益")
     private BigDecimal revenue;
 
-    @ApiModelProperty("红包收益比例")
-    private String revenueRate;
-
 }

yt-common/src/main/java/com/ytpm/app/model/YtNovelUser.java

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
 import java.util.List;
+
 /**
  * @author lih
  * @date 2025-09-30 09:38
@@ -52,6 +53,13 @@ public class YtNovelUser extends YtUser {
     @JsonSerialize(using = BigDecimalSerialize.class)
     private BigDecimal totalIncome;
 
+    @CustomField(node = 1)
+    @ApiModelProperty("今日记录次数")
+    private Integer todayRecordCount;
+
+    @ApiModelProperty("今日记录历史答题数")
+    private Integer historyRecordCount;
+
     @ApiModelProperty("广告观看记录")
     private List<YtNovelAdRecord> novelAdRecordList;
 }

yt-novel/yt-novel-service/src/main/java/com/ytpm/novel/dao/AdRecordMapper.java

@@ -104,4 +104,10 @@ public interface AdRecordMapper {
      * @param type 统计方式|1统计今日|2统计所有
      */
     BigDecimal getToTalRevenue(@Param("userId") String userId, @Param("type") Integer type);
+
+    /**
+     * 获取今日的红包收益
+     */
+    BigDecimal getTodayRedPacketBalance(String userId);
+
 }

yt-novel/yt-novel-service/src/main/java/com/ytpm/novel/dao/LoginRecordMapper.java

@@ -24,8 +24,14 @@ public interface LoginRecordMapper {
      */
     YtDyzLoginRecord getLastLoginRecord(@Param("userId") String userId, @Param("isVisitor") Integer isVisitor);
 
+    /**
+     * 查询用户登陆记录
+     */
     List<YtDyzLoginRecord> getLoginRecordByIds(@Param("userIds") String userIds);
 
+    /**
+     * 查询用户登陆记录
+     */
     List<String> queryLoginCount(AppUserQueryParam appUserQueryParam);
 
     int getTodayLoginCount(@Param("userId") String userId);

yt-novel/yt-novel-service/src/main/java/com/ytpm/novel/dao/NovelAdRecordMapper.java

@@ -5,7 +5,6 @@ import com.ytpm.app.model.YtNovelAdRecord;
 import org.apache.ibatis.annotations.Param;
 import org.mapstruct.Mapper;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -15,13 +14,14 @@ import java.util.List;
 @Mapper
 public interface NovelAdRecordMapper {
 
-    List<YtNovelAdRecord> selectToDayNovelRecode(@Param("userId") String userId);
-
-    void insertNovelAdRecord(@Param("param") YtNovelAdRecord adRecord);
+    /**
+     * 查询广告观看记录
+     */
+    List<YtNovelAdRecord> selectNovelAdRecords(@Param("userId") String userId);
 
     /**
-     * 获取答题收益
-     * @param type 1-今日 2-历史
+     * 保存广告观看记录
      */
-    BigDecimal getAnswerRevenue(@Param("userId")String userId, @Param("type") int type);
+    void insertNovelAdRecord(@Param("param") YtNovelAdRecord adRecord);
+
 }

yt-novel/yt-novel-service/src/main/java/com/ytpm/novel/model/param/NovelAdRecordParam.java

@@ -5,10 +5,10 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * 用户广告记录参数
+ *
  * @author lih
  * @date 2025-10-09 16:34
  */
@@ -21,9 +21,4 @@ public class NovelAdRecordParam implements Serializable {
     @ApiModelProperty("耗时")
     private Long duration;
 
-    @ApiModelProperty("红包收益")
-    private BigDecimal revenue;
-
-    @ApiModelProperty("红包收益比例")
-    private String revenueRate;
 }

yt-novel/yt-novel-service/src/main/java/com/ytpm/novel/service/impl/AdServiceImpl.java

@@ -380,7 +380,18 @@ public class AdServiceImpl implements AdService {
         if (param.getLoginStatus() != null && AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())) {
             adRecordMapper.addOneVisitor(adRecord);
         } else {
+            BigDecimal redPackRevenue = BigDecimal.ZERO;
+            // 更新用户红包收益
+            BigDecimal userRevenueRate = appUserService.getUserRevenueRate(user.getAppId());
+            if (userRevenueRate != null && param.getRevenue() != null
+                    && param.getRevenue().compareTo(BigDecimal.ZERO) > 0) {
+                redPackRevenue = param.getRevenue().multiply(userRevenueRate).setScale(5, RoundingMode.HALF_UP);
+                adRecord.setRevenueRate(userRevenueRate.toPlainString());
+            }
             adRecordMapper.addOne(adRecord);
+            if (redPackRevenue.compareTo(BigDecimal.ZERO) > 0) {
+                appUserMapper.updateUserRedPacket(user.getUserId(), redPackRevenue);
+            }
         }
         boolean updateUserTotal = !AdRecordEnum.LOGIN_BEFORE.getCode().equals(param.getLoginStatus())
                 || AdSourceTypeEnum.rewarded_video.getAdSourceType() != param.getAdSourceType();
@@ -413,19 +424,7 @@ public class AdServiceImpl implements AdService {
         BeanUtil.copyProperties(param, record);
         record.setRecordId(IdUtil.fastSimpleUUID());
         record.setRecordTime(new Date());
-        BigDecimal userRevenueRate = appUserService.getUserRevenueRate(user.getAppId());
-        BigDecimal redPackRevenue = BigDecimal.ZERO;
-        if (userRevenueRate != null) {
-            record.setRevenueRate(userRevenueRate.toPlainString());
-            if (record.getRevenue() != null && record.getRevenue().compareTo(BigDecimal.ZERO) > 0) {
-                redPackRevenue = record.getRevenue().multiply(userRevenueRate).setScale(5, RoundingMode.HALF_UP);
-            }
-        }
         novelAdRecordMapper.insertNovelAdRecord(record);
-        // 更新用户红包余额
-        if (redPackRevenue.compareTo(BigDecimal.ZERO) > 0) {
-            appUserMapper.updateUserRedPacket(user.getUserId(), redPackRevenue);
-        }
     }
 
 }

yt-novel/yt-novel-service/src/main/java/com/ytpm/novel/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import com.ytpm.agent.param.AuditUserParam;
 import com.ytpm.agent.view.AgentAuditCheckVO;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzLoginRecord;
+import com.ytpm.app.model.YtNovelAdRecord;
 import com.ytpm.app.model.YtNovelUser;
 import com.ytpm.app.param.AppUserRedPackParam;
 import com.ytpm.app.param.YtAppUserListParam;
@@ -33,6 +34,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -128,10 +130,18 @@ public class UserServiceImpl implements UserService {
     public YtNovelUser getUserInfo(String userId) {
         YtNovelUser user = appUserMapper.selectPrimaryKey(userId);
         if (user != null) {
-            user.setLoginRecordList(loginRecordMapper.getLoginRecords(userId));
-            user.setNovelAdRecordList(novelAdRecordMapper.selectToDayNovelRecode(userId));
+//            user.setLoginRecordList(loginRecordMapper.getLoginRecords(userId));
+            List<YtNovelAdRecord> list = novelAdRecordMapper.selectNovelAdRecords(userId);
+            user.setNovelAdRecordList(list);
+            user.setHistoryRecordCount(list.size());
+            Date currenDate = new Date();
+            long todayRecordCount = list.stream()
+                    .filter(item -> item.getRecordTime() != null)
+                    .filter(item -> DateUtil.isSameDay(item.getRecordTime(), currenDate))
+                    .count();
+            user.setTodayRecordCount((int) todayRecordCount);
             // 获取今日红包收益
-            BigDecimal todayRedPacketBalance = novelAdRecordMapper.getAnswerRevenue(userId, 1);
+            BigDecimal todayRedPacketBalance = adRecordMapper.getTodayRedPacketBalance(userId);
             if (todayRedPacketBalance != null) {
                 todayRedPacketBalance = todayRedPacketBalance.setScale(5, RoundingMode.HALF_UP);
             }

yt-novel/yt-novel-service/src/main/resources/mapper/AdRecordMapper.xml

@@ -4,27 +4,24 @@
 
     <insert id="addOne">
         insert into yt_dyz_ad_record
-        (
-            record_id,
-            user_id,
-            nick_name,
-            placement_id,
-            ad_source_id,
-            revenue,
-            network_form_id,
-            network_name,
-            network_placement_id,
-            begin_time,
-            finish_time,
-            result_json,
-            ad_source_index,
-            ad_source_type,
-            ecpm,
-            app_id
-        )
-        values
-            (
-                #{recordId},
+        (record_id,
+         user_id,
+         nick_name,
+         placement_id,
+         ad_source_id,
+         revenue,
+         network_form_id,
+         network_name,
+         network_placement_id,
+         begin_time,
+         finish_time,
+         result_json,
+         ad_source_index,
+         ad_source_type,
+         ecpm,
+         app_id,
+         revenue_rate)
+        values (#{recordId},
                 #{userId},
                 #{nickName},
                 #{placementId},
@@ -39,8 +36,8 @@
                 #{adSourceIndex},
                 #{adSourceType},
                 #{ecpm},
-                #{appId}
-            )
+                #{appId},
+                #{revenueRate})
     </insert>
     <insert id="batchAdd">
         insert into yt_dyz_ad_record
@@ -60,7 +57,8 @@
         ad_source_index,
         ad_source_type,
         ecpm,
-        app_id
+        app_id,
+        revenue_rate
         )
         values
         <foreach collection="adRecords" item="item" separator=",">
@@ -80,33 +78,30 @@
             #{item.adSourceIndex},
             #{item.adSourceType},
             #{item.ecpm},
-            #{item.appId}
+            #{item.appId},
+            #{item.revenueRate}
             )
         </foreach>
     </insert>
     <insert id="addOneVisitor">
         insert into yt_dyz_ad_record_visitor
-        (
-            record_id,
-            user_id,
-            nick_name,
-            placement_id,
-            ad_source_id,
-            revenue,
-            network_form_id,
-            network_name,
-            network_placement_id,
-            begin_time,
-            finish_time,
-            result_json,
-            ad_source_index,
-            ad_source_type,
-            ecpm,
-            app_id
-        )
-        values
-            (
-                #{recordId},
+        (record_id,
+         user_id,
+         nick_name,
+         placement_id,
+         ad_source_id,
+         revenue,
+         network_form_id,
+         network_name,
+         network_placement_id,
+         begin_time,
+         finish_time,
+         result_json,
+         ad_source_index,
+         ad_source_type,
+         ecpm,
+         app_id)
+        values (#{recordId},
                 #{userId},
                 #{nickName},
                 #{placementId},
@@ -121,8 +116,7 @@
                 #{adSourceIndex},
                 #{adSourceType},
                 #{ecpm},
-                #{appId}
-            )
+                #{appId})
     </insert>
     <insert id="batchAddVisitor">
         insert into yt_dyz_ad_record_visitor
@@ -142,7 +136,8 @@
         ad_source_index,
         ad_source_type,
         ecpm,
-        app_id
+        app_id,
+        revenue_rate
         )
         values
         <foreach collection="adRecords" item="item" separator=",">
@@ -162,7 +157,8 @@
             #{item.adSourceIndex},
             #{item.adSourceType},
             #{item.ecpm},
-            #{item.appId}
+            #{item.appId},
+            #{item.revenueRate}
             )
         </foreach>
 
@@ -379,4 +375,13 @@
         where user_id = #{userId} and JSON_EXTRACT(result_json, '$.id') = #{id}
         limit 1
     </select>
+    <select id="getTodayRedPacketBalance" resultType="java.math.BigDecimal">
+        select
+        sum(revenue * revenue_rate)
+        from yt_dyz_ad_record
+        where user_id = #{userId}  and revenue_rate is not null
+        <if test="type != null and type == 1">
+            and DATE_FORMAT(record_time, '%Y-%m-%d') = current_date()
+        </if>
+    </select>
 </mapper>

yt-novel/yt-novel-service/src/main/resources/mapper/AppUserMapper.xml

@@ -527,61 +527,30 @@
     </select>
     <select id="getAppRanking" resultType="com.ytpm.middle.view.AppRankingListVO">
         SELECT
-        u.app_id,
-        sum( ar.revenue ) totalRevenue
-        FROM
-        yt_dyz_ad_record ar
+            u.app_id,
+            sum( ar.revenue ) totalRevenue
+        FROM yt_dyz_ad_record ar
         JOIN yt_dyz_user u ON ar.user_id = u.user_id
-        <where>
-            <if test="sortBy != null">
-                <choose>
-                    <when test="sortBy == 1">
-                        DATE_FORMAT( ar.finish_time, '%Y-%m-%d' ) = CURRENT_DATE()
-                    </when>
-                    <when test=" sortBy == 2">
-                        YEARWEEK( ar.finish_time, 1 ) = YEARWEEK(now(),1)
-                    </when>
-                    <otherwise>
-                        DATE_FORMAT( ar.finish_time, '%Y-%m' ) = DATE_FORMAT(NOW(), '%Y-%m')
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
-        GROUP BY
-        u.app_id
-        ORDER BY
-        sum( ar.revenue ) DESC
+        WHERE ar.finish_time >= #{beginTime}
+            AND ar.finish_time <![CDATA[<=]]> #{endTime}
+        GROUP BY u.app_id
+        ORDER BY sum( ar.revenue ) DESC
         LIMIT #{limit}
     </select>
     <select id="getUserRanking" resultType="com.ytpm.middle.view.UserRankingListVO">
         SELECT
-        u.user_id,
-        u.nick_name,
-        u.head_img,
-        u.total_video,
-        sum( ar.revenue ) totalIncome
-        FROM
-        yt_dyz_ad_record ar
+            u.user_id,
+            u.nick_name,
+            u.head_img,
+            u.total_video,
+            sum( ar.revenue ) totalIncome
+        FROM yt_dyz_ad_record ar
         JOIN yt_dyz_user u ON ar.user_id = u.user_id
-        <where>
-            <if test="sortBy != null">
-                <choose>
-                    <when test="sortBy == 1">
-                        DATE_FORMAT( ar.finish_time, '%Y-%m-%d' ) = CURRENT_DATE()
-                    </when>
-                    <when test=" sortBy == 2">
-                        YEARWEEK( ar.finish_time, 1 ) = YEARWEEK(now(),1)
-                    </when>
-                    <otherwise>
-                        DATE_FORMAT( ar.finish_time, '%Y-%m' ) = DATE_FORMAT(NOW(), '%Y-%m')
-                    </otherwise>
-                </choose>
-            </if>
-        </where>
+        WHERE ar.finish_time >= #{beginTime}
+            AND ar.finish_time <![CDATA[<=]]> #{endTime}
         GROUP BY ar.user_id
-        ORDER BY
-        sum( ar.revenue ) DESC
-        limit #{limit}
+        ORDER BY sum( ar.revenue ) DESC
+        LIMIT #{limit}
     </select>
     <select id="countUserByAppIds" resultType="java.lang.Integer">
         select

yt-novel/yt-novel-service/src/main/resources/mapper/LoginRecordMapper.xml

@@ -30,6 +30,7 @@
             record_id, user_id, login_time, device_brand, device_model, login_ip, operator, ip_addr
         from yt_dyz_login_record
         where user_id = #{userId}
+        order by login_time desc
     </select>
 
     <select id="queryLoginCount" resultType="String">

yt-novel/yt-novel-service/src/main/resources/mapper/NovelAdRecordMapper.xml

@@ -2,23 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ytpm.novel.dao.NovelAdRecordMapper">
     <insert id="insertNovelAdRecord">
-        insert into yt_novel_ad_record(record_id, user_id, duration, record_time, revenue, revenue_rate)
-        values (#{param.recordId}, #{param.userId}, #{param.duration}, #{param.recordTime}, #{param.revenue}, #{param.revenueRate})
+        insert into yt_novel_ad_record(record_id, user_id, duration, record_time, revenue)
+        values (#{param.recordId}, #{param.userId}, #{param.duration}, #{param.recordTime}, #{param.revenue})
     </insert>
 
-    <select id="selectToDayNovelRecode" resultType="com.ytpm.app.model.YtNovelAdRecord">
-        select record_id, user_id, duration, record_time, revenue, revenue_rate
+    <select id="selectNovelAdRecords" resultType="com.ytpm.app.model.YtNovelAdRecord">
+        select record_id, user_id, duration, record_time, revenue
         from yt_novel_ad_record
         where user_id = #{userId}
         order by record_time desc
     </select>
-    <select id="getAnswerRevenue" resultType="java.math.BigDecimal">
-        select
-        sum(revenue * revenue_rate)
-        from yt_novel_ad_record
-        where user_id = #{userId} and revenue is not null and revenue_rate is not null
-        <if test="type != null and type == 1">
-            and DATE_FORMAT(record_time, '%Y-%m-%d') = current_date()
-        </if>
-    </select>
 </mapper>

yt-question/yt-question-service/src/main/resources/bootstrap.yml

@@ -34,12 +34,12 @@ spring:
     #name-zh: '每天爱跑步'
     #name: lemon-service
     #name-zh: '青柠檬记账'
-    name: lime-service
-    name-zh: '青柠记账'
+#    name: lime-service
+#    name-zh: '青柠记账'
     #name: mileage-service
     #name-zh: '宠物里程表'
-    #name: nofeeds-service
-    #name-zh: 'Nofeeds'
+    name: nofeeds-service
+    name-zh: 'Nofeeds'
     #name: picking-service
     #name-zh: '找茬挑战王'
     #name: proverb-service
@@ -71,8 +71,6 @@ spring:
   profiles:
     # 当前为本地模式
     active: local
-server:
-  port: 25829
 yt:
   port: 8848
   file-extension: yml

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

@@ -1,6 +1,5 @@
 package com.ytpm.controller;
 
-import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.model.YtUser;
 import com.ytpm.general.Result;
 import com.ytpm.risk.view.RiskTemplateView;
@@ -81,7 +80,7 @@ public class PublicApiController {
      */
     @ApiOperation("批量审核用户")
     @PostMapping("/batchAudit")
-    public void batchAudit(@RequestParam("userList") List<YtDyzUser> userList){
+    public void batchAudit(@RequestParam("userList") List<YtUser> userList){
         riskService.batchAudit(userList);
     }
 
@@ -93,7 +92,7 @@ public class PublicApiController {
 
     @ApiOperation("校验注册风控配置")
     @PostMapping("/checkRegRisk")
-    public Result<?> checkRegRisk(@RequestBody YtDyzUser dyzUser){
+    public Result<?> checkRegRisk(@RequestBody YtUser dyzUser){
         return riskService.checkRegRisk(dyzUser);
     }
 

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

@@ -107,7 +107,7 @@ public interface RiskService {
     /**
      * 批量审核用户
      */
-    void batchAudit(List<YtDyzUser> userList);
+    void batchAudit(List<YtUser> userList);
 
     /**
      * 增加解禁记录
@@ -122,7 +122,7 @@ public interface RiskService {
     /**
      * 校验注册风控规则
      */
-    Result<?> checkRegRisk(YtDyzUser dyzUser);
+    Result<?> checkRegRisk(YtUser dyzUser);
 
     /**
      * 校验登录风控配置

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

@@ -26,7 +26,6 @@ import com.ytpm.agent.view.AgentUserInfo;
 import com.ytpm.app.enums.LoginType;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzLoginRecord;
-import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.model.YtUser;
 import com.ytpm.custom.CustomField;
 import com.ytpm.dao.AppMapper;
@@ -135,7 +134,7 @@ public class RiskServiceImpl implements RiskService {
             log.error(e.getMessage());
             throw new CustomerException(e.getMessage());
         }
-        return ResultTable.resultTableOk(new PageInfo<RiskConfigView>(configList));
+        return ResultTable.resultTableOk(new PageInfo<>(configList));
     }
 
     /**
@@ -270,7 +269,7 @@ public class RiskServiceImpl implements RiskService {
     @Override
     public ResultTable<RiskConfigListView> getRiskConfigList(RiskConfigParam param) {
         PageHelper.startPage(param.getPage(),param.getLimit());
-        return ResultTable.resultTableOk(new PageInfo<RiskConfigListView>(configMapper.getRiskConfigList(param)));
+        return ResultTable.resultTableOk(new PageInfo<>(configMapper.getRiskConfigList(param)));
     }
 
     /**
@@ -283,7 +282,7 @@ public class RiskServiceImpl implements RiskService {
         if(CollUtil.isNotEmpty(bannedList)){
 //            setBannedLoginInfo(bannedList);
         }
-        return ResultTable.resultTableOk(new PageInfo<RiskBannedListView>(bannedList));
+        return ResultTable.resultTableOk(new PageInfo<>(bannedList));
     }
 
 
@@ -297,7 +296,7 @@ public class RiskServiceImpl implements RiskService {
         if(CollUtil.isNotEmpty(deblockingList)){
 //            setDeblockLoginInfo(deblockingList,param);
         }
-        return ResultTable.resultTableOk(new PageInfo<RiskDeblockingListView>(deblockingList));
+        return ResultTable.resultTableOk(new PageInfo<>(deblockingList));
     }
 
     /**
@@ -625,7 +624,7 @@ public class RiskServiceImpl implements RiskService {
     /**
      * 校验用户自定义风控规则
      */
-    private void checkCustomRisk(YtDyzUser dyzUser, Integer node, List<YtDyzAdRecord> data) {
+    private void checkCustomRisk(YtUser dyzUser, Integer node, List<YtDyzAdRecord> data) {
         List<RiskTemplateView> templateList = configMapper.getCustomTempConfig(
                 dyzUser.getAppId(), node);
         if(CollUtil.isNotEmpty(templateList)){
@@ -770,7 +769,7 @@ public class RiskServiceImpl implements RiskService {
      * 修改用户信息
      */
     private void modifyAppUserInfo(String userId, RiskUserStatusParam param) {
-        YtDyzUser appUser = new YtDyzUser();
+        YtUser appUser = new YtUser();
         appUser.setUserId(param.getUserId());
         appUser.setUserStatus(param.getUserStatus());
         switch (param.getUserStatus()){
@@ -963,7 +962,7 @@ public class RiskServiceImpl implements RiskService {
      * 批量审核用户
      */
     @Override
-    public void batchAudit(List<YtDyzUser> userList) {
+    public void batchAudit(List<YtUser> userList) {
         //查询这些用户当天的激励视频收益是否符合
 
     }
@@ -1006,7 +1005,7 @@ public class RiskServiceImpl implements RiskService {
      * 校验注册风控规则
      */
     @Override
-    public Result<?> checkRegRisk(YtDyzUser dyzUser) {
+    public Result<?> checkRegRisk(YtUser dyzUser) {
         RiskTemplateView view= configMapper.getByCode(dyzUser.getAppId()+"-333");
         return checkReg333(dyzUser,view);
     }
@@ -1058,7 +1057,7 @@ public class RiskServiceImpl implements RiskService {
                     userApp =  appMapper.selectParentApp(ytApp.getSuperiorId());
                 }
                 scheduledExecutorService.schedule(()->{
-                    YtDyzUser next = new YtDyzUser();
+                    YtUser next = new YtUser();
                     next.setUserId(dyzUser.getUserId());
                     next.setUserStatus(UserStatusEnum.VISITOR_LOCK.getCode());
                     next.setRiskCode("344");
@@ -1081,7 +1080,7 @@ public class RiskServiceImpl implements RiskService {
     /**
      * 校验游客登录323规则
      */
-    private void checkVisitor323(YtDyzUser dyzUser, RiskTemplateView view) {
+    private void checkVisitor323(YtUser dyzUser, RiskTemplateView view) {
         if(view != null && view.getEnabled() != 1) return;
         List<RiskConfigView> configList = view == null ? Collections.emptyList() : view.getConfigList();
         Map<String, String> configMap = configList.stream().collect(
@@ -1158,7 +1157,7 @@ public class RiskServiceImpl implements RiskService {
      * @param dyzUser 该设备同应用的最新一条注册用户信息
      * @param view 当前校验的设备登录的应用风控配置
      */
-    private Result<?> checkReg333(YtDyzUser dyzUser, RiskTemplateView view) {
+    private Result<?> checkReg333(YtUser dyzUser, RiskTemplateView view) {
         //根据用户所属应用查询该应用母包openid查询用户信息
         List<RiskConfigView> configList = view == null ? Collections.emptyList() : view.getConfigList();
         Map<String, String> configMap = configList.stream().collect(