平台ID生成

yt-app/app-service/src/main/java/com/ytpm/controller/UserController.java

@@ -2,6 +2,7 @@ package com.ytpm.controller;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.ytpm.advertise.enums.AdSourceTypeEnum;
 import com.ytpm.app.model.YtDyzAdRecord;
 import com.ytpm.app.model.YtDyzUser;
 import com.ytpm.app.param.AppUserParam;
@@ -54,9 +55,9 @@ public class UserController {
         PageHelper.startPage(param.getPage(), param.getLimit());
         List<YtAppUserListView> dyzUsers = appUserMapper.queryAll(param);
         if (dyzUsers.isEmpty()) return ResultTable.resultTableOk(new PageInfo<YtAppUserListView>(dyzUsers));
-        List<YtDyzAdRecord> ids = adRecordMapper.getRewardAdRecords(
+        List<YtDyzAdRecord> adRecords = adRecordMapper.getByUserIds(
                 dyzUsers.stream().map(YtAppUserListView::getUserId).collect(Collectors.joining(",")));
-        Map<String, List<YtDyzAdRecord>> userAdMap = ids.stream().collect(
+        Map<String, List<YtDyzAdRecord>> userAdMap = adRecords.stream().collect(
                 Collectors.groupingBy(YtDyzAdRecord::getUserId));
         setUserExtInfo(dyzUsers,userAdMap);
         return ResultTable.resultTableOk(new PageInfo<YtAppUserListView>(dyzUsers));
@@ -68,15 +69,16 @@ public class UserController {
     private void setUserExtInfo(List<YtAppUserListView> dyzUsers, Map<String, List<YtDyzAdRecord>> userAdMap) {
         for (YtAppUserListView user : dyzUsers) {
             user.setLoginRecordList(loginRecordMapper.getLoginRecords(user.getUserId()));
-            user.setTodayVideo(userAdMap.containsKey(user.getUserId()) ?
-                    userAdMap.get(user.getUserId()).size() : 0);
-            //获取今日收益
+            //获取今日收益 | 今日视频播放数
             if (userAdMap.containsKey(user.getUserId())) {
                 List<YtDyzAdRecord> ytDyzAdRecords = userAdMap.get(user.getUserId());
                 BigDecimal todayIncome = calculateTodayIncome(ytDyzAdRecords);
+                user.setTodayVideo((int) ytDyzAdRecords.stream().filter(
+                        s->s.getAdSourceType()== AdSourceTypeEnum.rewarded_video.getAdSourceType()).count());
                 user.setTodayIncome(todayIncome);
             } else {
                 user.setTodayIncome(BigDecimal.ZERO);
+                user.setTodayVideo(0);
             }
         }
     }

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

@@ -20,5 +20,5 @@ public interface AdRecordMapper {
     /**
      * 查询激励视频记录
      */
-    List<YtDyzAdRecord> getRewardAdRecords(@Param("userIds") String userIds);
+    List<YtDyzAdRecord> getByUserIds(@Param("userIds") String userIds);
 }

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

@@ -50,13 +50,11 @@
           </if>
         order by finish_time desc
     </select>
-    <select id="getRewardAdRecords" resultType="com.ytpm.app.model.YtDyzAdRecord">
+    <select id="getByUserIds" resultType="com.ytpm.app.model.YtDyzAdRecord">
         select
             record_id, user_id, nick_name, placement_id, ad_source_id, revenue, network_form_id, network_name, network_placement_id, finish_time, begin_time,result_json,ad_source_type,ad_source_index,ecpm
         from yt_dyz_ad_record
-        where
-            ad_source_type = 1
-           and user_id in
+        where user_id in
               <foreach collection="userIds.split(',')" open="(" close=")" separator="," item="item">
                   #{item}
               </foreach>