视频总数只显示激励视频

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

@@ -54,7 +54,7 @@ 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.getByUserIds(
+        List<YtDyzAdRecord> ids = adRecordMapper.getRewardAdRecords(
                 dyzUsers.stream().map(YtAppUserListView::getUserId).collect(Collectors.joining(",")));
         Map<String, List<YtDyzAdRecord>> userAdMap = ids.stream().collect(
                 Collectors.groupingBy(YtDyzAdRecord::getUserId));

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

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

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

@@ -78,5 +78,13 @@ public interface AppUserMapper {
      */
     String getSecretByAppId(@Param("appId") String appId);
 
+    /**
+     * 根据微信openid查询用户
+     */
     List<YtDyzUser> queryByOpenid(@Param("openid")String openid);
+
+    /**
+     * 根据设备ID查询用户
+     */
+    YtDyzUser getByDeviceId(@Param("deviceId")String deviceId);
 }

yt-app/app-service/src/main/java/com/ytpm/service/impl/AppUserServiceImpl.java

@@ -136,6 +136,7 @@ public class AppUserServiceImpl implements AppUserService {
         old.setUserStatus(UserStatusEnum.NORMAL.getCode());
         old.setWxOpenId(loginResult.getOpenid());
         old.setHeadImg(wxUserInfo.getHeadimgurl());
+
         old.setPlatformId(StrConstant.PLATFORM_ID_PREFIX + IdUtil.getSnowflakeNextIdStr());
         appUserMapper.addOne(old);
     }

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

@@ -50,11 +50,13 @@
           </if>
         order by finish_time desc
     </select>
-    <select id="getByUserIds" resultType="com.ytpm.app.model.YtDyzAdRecord">
+    <select id="getRewardAdRecords" 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 user_id in
+        where
+            ad_source_type = 1
+           and user_id in
               <foreach collection="userIds.split(',')" open="(" close=")" separator="," item="item">
                   #{item}
               </foreach>

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

@@ -258,4 +258,10 @@
         from yt_dyz_user
         where wx_open_id = #{openid}
     </select>
+    <select id="getByDeviceId" resultType="com.ytpm.app.model.YtDyzUser">
+        select
+            user_id, head_img, nick_name, registry_time, last_login_time, last_login_ip, login_days, total_video, total_income, red_packet_balance, red_packet_amount, points_balance, points_total, withdraw_total, sign_days, user_status, risk_reason, wx_open_id, ditch_id, app_id, platform_id, power, phone, device_id
+        from yt_dyz_user
+        where device_id = #{deviceId}
+    </select>
 </mapper>