修改首页报表bug

增加应用列表筛选条件
增加app注册用户渠道ID

yt-agent/agent-service/src/main/java/com/ytpm/controller/AgentIndexController.java

@@ -97,8 +97,8 @@ public class AgentIndexController {
                     //ecpm数据
                     BigDecimal todayEcpm = platformReports.stream()
                             .filter(item -> todayStr.equals(item.getDate()))
-                            .filter(Objects::nonNull)
                             .map(ComprehensiveAppReport::getEcpm)
+                            .filter(Objects::nonNull)
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     resParam.setToday(todayRevenue.setScale(2, RoundingMode.HALF_UP).toString());
                     resParam.setEcpmToday(todayEcpm.setScale(2, RoundingMode.HALF_UP).toString());
@@ -114,8 +114,8 @@ public class AgentIndexController {
                     //昨天ecpm数据
                     BigDecimal yesterdayEcpm = platformReports.stream()
                             .filter(item -> yesterdayStr.equals(item.getDate()))
-                            .filter(Objects::nonNull)
                             .map(ComprehensiveAppReport::getEcpm)
+                            .filter(Objects::nonNull)
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     resParam.setEcpmYesterday(yesterdayEcpm.setScale(2, RoundingMode.HALF_UP).toString());
 
@@ -137,8 +137,8 @@ public class AgentIndexController {
                                         return date != null && date.compareTo(monthStartStr) >= 0
                                                 && date.compareTo(monthEndStr) <= 0;
                                     })
-                            .filter(Objects::nonNull)
                             .map(ComprehensiveAppReport::getEcpm)
+                            .filter(Objects::nonNull)
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     resParam.setMonth(monthRevenue.setScale(2, RoundingMode.HALF_UP).toString());
                     resParam.setEcpmMonth(monthEcpm.setScale(2, RoundingMode.HALF_UP).toString());

yt-agent/agent-service/src/main/resources/mapper/AgentAppMapper.xml

@@ -55,7 +55,7 @@
             ya.coppa,
             ya.ccpa,
             ya.screen_orientation,
-            ya.ditch_name
+            ya.ditch_name,
             GROUP_CONCAT( acr.channel_id ) channel_id,
             GROUP_CONCAT( acr.channel_name ) channel_name,
             GROUP_CONCAT( acr.network_app_id ) network_app_id,
@@ -67,6 +67,12 @@
                 LEFT JOIN yt_platform_user u ON ya.user_id = u.user_id
         WHERE
             ya.user_id = #{userId}
+        <if test="appName !=null and appName != ''">
+            and ya.app_name like concat('%', #{appName} ,'%')
+        </if>
+        <if test="appType !=null">
+            and ya.app_type = #{appType}
+        </if>
         GROUP BY
             ya.app_id
     </select>

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

@@ -188,6 +188,7 @@ public class WxController {
         old.setPointsBalance(BigDecimal.ZERO);
         old.setPointsTotal(BigDecimal.ZERO);
         old.setWithdrawTotal(BigDecimal.ZERO);
+        old.setDitchId(param.getDitchId());
         old.setSignDays(0);
         old.setUserStatus(UserStatusEnum.NORMAL.getCode());
         old.setWxOpenId(loginResult.getOpenid());

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

@@ -22,6 +22,7 @@
          user_status,
          risk_reason,
          wx_open_id,
+         ditch_id,
          platform_id,
          power
         )
@@ -45,6 +46,7 @@
          #{userStatus},
          #{riskReason},
          #{wxOpenId},
+         #{ditchId},
          #{platformId},
          #{power}
         )
@@ -122,6 +124,9 @@
             <if test="wxOpenId != null">
                 wx_open_id = #{wxOpenId},
             </if>
+            <if test="ditchId != null">
+                ditch_id = #{ditchId},
+            </if>
             <if test="platformId != null">
                 platform_id = #{platformId}
             </if>
@@ -130,24 +135,24 @@
     </update>
     <select id="getYtAppUser" resultType="com.ytpm.app.model.YtDyzUser">
         select
-           user_id, nick_name,head_img, power, 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, platform_id
+           user_id, ditch_id, nick_name,head_img, power, 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, platform_id
         from yt_dyz_user
         where wx_open_id = #{openid}
     </select>
     <select id="queryAll" resultType="com.ytpm.app.model.YtDyzUser">
         select
-            user_id, nick_name,head_img, power, 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, platform_id
+            user_id, ditch_id, nick_name,head_img, power, 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, platform_id
         from yt_dyz_user
     </select>
     <select id="selectPrimaryKey" 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, platform_id, power
+            user_id, ditch_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, platform_id, power
         from yt_dyz_user
         where user_id = #{userId}
     </select>
     <select id="getUserList" 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, platform_id, power
+            user_id, ditch_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, platform_id, power
         from yt_dyz_user
         where user_id in
         <foreach collection="userIds.split(',')" item="item" separator="," open="(" close=")">

yt-common/src/main/java/com/ytpm/agent/param/AppListParam.java

@@ -16,7 +16,10 @@ import lombok.NoArgsConstructor;
 public class AppListParam extends PageMeta {
     @ApiModelProperty("app名称")
     private String appName;
+    @ApiModelProperty("用户ID")
     private String userId;
+    @ApiModelProperty("app类型")
     private Integer appType;
+    @ApiModelProperty("渠道名称")
     private String channelName;
 }

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

@@ -108,4 +108,6 @@ public class YtDyzUser {
     private String riskCode;
     @ApiModelProperty("今日视频播放数")
     private int todayVideo;
+    @ApiModelProperty(value = "渠道ID")
+    private long ditchId;
 }

yt-common/src/main/java/com/ytpm/app/param/WxLoginParam.java

@@ -21,4 +21,6 @@ public class WxLoginParam {
     private String ipLocation;
     @ApiModelProperty(value = "微信登录认证授权码",required = true)
     private String wxCode;
+    @ApiModelProperty(value = "渠道ID")
+    private long ditchId;
 }