:feat:

1、新用户充值金额（支付宝金额、微信金额、米大师金额)
2、支付宝、微信、米大师新用户累计充值金额(自然量)
3、角色充值排行榜 增加筛选条件 角色最近充值时间

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleRechargeRankingDTO.java

@@ -271,5 +271,17 @@ public class RoleRechargeRankingDTO extends BasePage {
     @ApiModelProperty(value = "玩家渠道id")
     private List<Long> agentIds;
 
+    /**
+     * 角色最近充值时间最小值
+     */
+    @ApiModelProperty(value = "角色最近充值时间最小值")
+    private LocalDate roleLastPayTimeMin;
+    /**
+     * 角色最近充值时间最大值
+     */
+    @ApiModelProperty(value = "角色最近充值时间最大值")
+    private LocalDate roleLastPayTimeMax;
+
+
 
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GameDataTotalTotalVO.java

@@ -121,6 +121,32 @@ public class GameDataTotalTotalVO {
     @ApiModelProperty(value = "新用户累计充值金额（总量）")
     private BigDecimal newUserTotalAmount;
 
+    /**
+     * 新用户充值金额（支付宝金额）
+     */
+    @ApiModelProperty(value = "支付宝金额")
+    private BigDecimal alipayAmount;
+    /**
+     * 新用户充值金额（微信金额）
+     */
+    @ApiModelProperty(value = "微信金额")
+    private BigDecimal wxAmount;
+    /**
+     * 新用户充值金额（米大师金额）
+     */
+    @ApiModelProperty(value = "米大师金额")
+    private BigDecimal miMasterAmount;
+
+    @ApiModelProperty(value = "支付宝新用户累计充值金额(自然量)")
+    private BigDecimal natureNewUserTotalZfbAmount;
+
+    @ApiModelProperty(value = "微信新用户累计充值金额(自然量)")
+    private BigDecimal natureNewUserTotalWxAmount;
+
+    @ApiModelProperty(value = "米大师新用户累计充值金额(自然量)")
+    private BigDecimal natureNewUserTotalMdsAmount;
+
+
     /**
      * 首日Roi（总量）
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GameDataTotalVO.java

@@ -61,6 +61,32 @@ public class GameDataTotalVO {
     @ApiModelProperty(value = "新用户充值人数（总量）")
     private Long newUserAmountNum;
 
+    /**
+     * 新用户充值金额（支付宝金额）
+     */
+    @ApiModelProperty(value = "支付宝金额")
+    private BigDecimal alipayAmount;
+    /**
+     * 新用户充值金额（微信金额）
+     */
+    @ApiModelProperty(value = "微信金额")
+    private BigDecimal wxAmount;
+    /**
+     * 新用户充值金额（米大师金额）
+     */
+    @ApiModelProperty(value = "米大师金额")
+    private BigDecimal miMasterAmount;
+
+
+    @ApiModelProperty(value = "支付宝新用户累计充值金额(自然量)")
+    private BigDecimal natureNewUserTotalZfbAmount;
+
+    @ApiModelProperty(value = "微信新用户累计充值金额(自然量)")
+    private BigDecimal natureNewUserTotalWxAmount;
+
+    @ApiModelProperty(value = "米大师新用户累计充值金额(自然量)")
+    private BigDecimal natureNewUserTotalMdsAmount;
+
     /**
      * 新用户充值金额（总量）
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/PitcherDataDayTotalVO.java

@@ -121,6 +121,12 @@ public class PitcherDataDayTotalVO {
     @ApiModelProperty(value = "单日付费100+人数")
     private Long hundredUserNum;
 
+    /**
+     * 7日累充500+用户数
+     */
+    @ApiModelProperty(value = "7日累充500+用户数")
+    private Long totalFiveHundredUserCount;
+
     /**
      * 买量新用户累计充值金额
      */

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/PitcherDataDayVO.java

@@ -206,6 +206,12 @@ public class PitcherDataDayVO {
     @ApiModelProperty(value = "买量回收率")
     private BigDecimal buyRoi;
 
+    /**
+     * 7日累充500+用户数
+     */
+    @ApiModelProperty(value = "7日累充500+用户数")
+    private Long totalFiveHundredUserCount;
+
     /**
      * 当日回收率
      */
@@ -2154,4 +2160,6 @@ public class PitcherDataDayVO {
     @ApiModelProperty(value = "da1的用户详情")
     private FirstNewUserAgainTrendVO userDetails;
 
+
+
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/PitcherDataServiceImpl.java

@@ -2387,7 +2387,8 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     first_role_rate,
                     new_user_total_role_rate,
                     role_num_rate,
-                    new_user_amount_ratio
+                    new_user_amount_ratio,
+                    total_five_hundred_user_count
                 FROM 
                 """ + tableName;
     }
@@ -2878,6 +2879,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     ROUND(IF(SUM(new_user_total_amount_num) > 0 , SUM(new_user_total_amount) / SUM(new_user_total_amount_num), 0), 2) as today_arpu,
                     ROUND(IF(SUM(amount_num) > 0 , SUM(amount) / SUM(amount_num), 0), 2) as paper_arpu,
                     SUM(hundred_user_num) as hundred_user_num,
+                    SUM(total_five_hundred_user_count) AS total_five_hundred_user_count,
                     ROUND(IF(SUM(hundred_user_num) > 0 , SUM(cost) / SUM(hundred_user_num), 0), 2) as hundred_user_num_cost,
                     ROUND(IF(SUM(cost) > 0 , SUM(da1) / SUM(cost), 0), 4) as roi1,
                     ROUND(IF(SUM(cost) > 0 , SUM(da2) / SUM(cost), 0), 4) as roi2,

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -419,6 +419,10 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (dto.getLastActiveTimeMax() != null && dto.getLastActiveTimeMin() != null) {
             criA.where().andBetween("DATE(role_active_time)", dto.getLastActiveTimeMin(), dto.getLastActiveTimeMax());
         }
+        //角色最近充值时间
+        if(dto.getRoleLastPayTimeMin() != null && dto.getRoleLastPayTimeMax() != null){
+            criA.where().andBetween("DATE(role_last_pay_time)", dto.getRoleLastPayTimeMin(), dto.getRoleLastPayTimeMax());
+        }
         return criA;
     }