Merge remote-tracking branch 'origin/package' into package

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

@@ -132,6 +132,9 @@ public class GamePromoteTotalVO {
     @ApiModelProperty(notes = "新用户充值人数")
     private Long userRechargeUser;
 
+    @ApiModelProperty(notes = "不展示字段--新用户复充人数")
+    private Long repeatRechargeUser;
+
     @ApiModelProperty(notes = "新用户充值金额")
     private BigDecimal userRechargeMoney;
 

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

@@ -47,6 +47,12 @@ public class PlayerRechargeRankingVO {
     @ApiModelProperty("注册游戏ID")
     private Long regGameId;
 
+    /**
+     * 注册游戏ID
+     */
+    @ApiModelProperty("注册游戏名")
+    private String regGameName;
+
     /**
      * 玩家操作系统
      */
@@ -56,9 +62,12 @@ public class PlayerRechargeRankingVO {
     /**
      * 最近充值游戏
      */
-    @ApiModelProperty("最近充值游戏")
+    @ApiModelProperty("最近充值游戏ID")
     private Long lastAmountGameId;
 
+    @ApiModelProperty("最近充值游戏名称")
+    private String lastAmountGameName;
+
     /**
      * 最近充值时间
      */

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

@@ -185,10 +185,10 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         pager.setRecordCount((int) Daos.queryCount(dao, sqlCount));
         List<GamePromoteTotalVO> list = sql.getList(GamePromoteTotalVO.class);
 
-        //存在充值时间，获取表ads_dayn_amount的json数据
+        //渠道注册时间内的dayn充值数据，获取表ads_dayn_amount的json数据
         Map<String, Object> dayNMap = new HashMap<>(4);
-        dayNMap.put("beginDay", dto.getRechargeBeginDay());
-        dayNMap.put("endDay", dto.getRechargeEndDay());
+        dayNMap.put("beginDay", dto.getCostBeginDay());
+        dayNMap.put("endDay", dto.getCostEndDay());
 
         //循环总数据的每条数据
         List<GamePromoteTotalVO> hasRechargeDayList = list.stream().map(item -> {
@@ -208,7 +208,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 List<Map<String, String>> jsonList = gson.fromJson(dayNList.toString(), ArrayList.class);
 
                 Map<String, String> resultMap = new HashMap<>();
-                resultMap.put("dayN", "0.00-0-0");
+                resultMap.put("dayN", "0.00-0-0-0");
                 for (Map<String, String> jsonMap : jsonList) {
                     for (Map.Entry<String, String> entry : jsonMap.entrySet()) {
                         String key = entry.getKey();
@@ -220,7 +220,8 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                             BigDecimal money = new BigDecimal(existingParts[0]).add(new BigDecimal(parts[0]));
                             int count = Integer.parseInt(existingParts[1]) + Integer.parseInt(parts[1]);
                             int num = Integer.parseInt(existingParts[2]) + Integer.parseInt(parts[2]);
-                            String newValue = money + "-" + count + "-" + num;
+                            int repeatNum = Integer.parseInt(existingParts[3]) + Integer.parseInt(parts[3]);
+                            String newValue = money + "-" + count + "-" + num + "-" + repeatNum;
                             resultMap.put("dayN", newValue);
                         }
                     }
@@ -231,6 +232,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                             .rechargeMoney(new BigDecimal(parts[0]))
                             .rechargeCount(Long.valueOf(parts[1]))
                             .rechargeNum(Long.valueOf(parts[2]))
+                            .repeatNum(Long.valueOf(parts[3]))
                             .build();
                 }
             }
@@ -239,6 +241,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
                 item.setUserRechargeMoney(dayN.getRechargeMoney());
                 item.setUserRechargeCount(dayN.getRechargeCount());
                 item.setUserRechargeUser(dayN.getRechargeNum());
+                item.setRepeatRechargeUser(dayN.getRepeatNum());
                 item.setUserRechargeArpu(item.getUserRechargeUser() == 0 ?
                         BigDecimal.ZERO:item.getUserRechargeMoney().divide(BigDecimal.valueOf(item.getUserRechargeUser()),4, RoundingMode.DOWN));
 
@@ -260,6 +263,11 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
 
                 item.setUserRechargeCost(item.getUserRechargeUser() == 0 ?
                         BigDecimal.ZERO:item.getCost().divide(BigDecimal.valueOf(item.getUserRechargeUser()),4, RoundingMode.DOWN));
+
+                item.setRepeatRechargeRate(item.getUserRechargeUser() == 0 ?
+                        BigDecimal.ZERO:BigDecimal.valueOf(item.getRepeatRechargeUser()).divide(BigDecimal.valueOf(item.getUserRechargeUser()),4, RoundingMode.DOWN));
+                item.setUserRepeatRechargeRate(item.getNewUserRechargeUser() == 0 ?
+                        BigDecimal.ZERO:BigDecimal.valueOf(item.getRepeatRechargeUser()).divide(BigDecimal.valueOf(item.getNewUserRechargeUser()),4, RoundingMode.DOWN));
             }
             return item;
         }).collect(Collectors.toList());
@@ -542,5 +550,6 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         private BigDecimal rechargeMoney;
         private Long rechargeCount;
         private Long rechargeNum;
+        private Long repeatNum;
     }
 }

game-module/game-module-manage/pom.xml

@@ -92,10 +92,12 @@
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-spring-boot-starter</artifactId>
+            <version>3.2.3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-metadata-definition-protobuf</artifactId>
+            <version>3.2.3</version>
         </dependency>
         <!-- 腾讯广告服务 -->
         <dependency>