Bläddra i källkod

修改内容:游戏数据-游戏,用户排行榜;订单明细;推广每日数据

shishaosong 2 år sedan
förälder
incheckning
efc4c6e99e

+ 1 - 1
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/GameOrderDetailDTO.java

@@ -59,7 +59,7 @@ public class GameOrderDetailDTO extends BasePage<GameOrder> implements Serializa
     private String account;
 
     @ApiModelProperty(notes = "投手名")
-    private String sysUser;
+    private String sysUserName;
 
     @ApiModelProperty(notes = "操作设备")
     private String device;

+ 2 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GamePromoteVO.java

@@ -18,6 +18,8 @@ import java.time.LocalDateTime;
 public class GamePromoteVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private String id;
+
     @ApiModelProperty(notes = "渠道id")
     private Long agentId;
 

+ 3 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GameRankingRechargeGameVO.java

@@ -16,6 +16,9 @@ import java.time.LocalDate;
 @Builder
 public class GameRankingRechargeGameVO implements Serializable {
     private static final long serialVersionUID = 1L;
+
+    private String id;
+
     @ApiModelProperty(notes = "游戏id")
     private String gameId;
 

+ 2 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/GameRankingRechargeUserVO.java

@@ -17,6 +17,8 @@ import java.time.LocalDateTime;
 public class GameRankingRechargeUserVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private String id;
+
     @ApiModelProperty(notes = "玩家ID")
     private Long userId;
 

+ 2 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/RechargeTrendVO.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.data.serve.pojo.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -13,6 +14,7 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@ApiModel(value = "付费趋势")
 public class RechargeTrendVO {
     @ApiModelProperty(notes = "充值人数")
     private Long rechargeCount;

+ 2 - 0
game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/RetentionTrendVO.java

@@ -1,5 +1,6 @@
 package com.zanxiang.game.data.serve.pojo.vo;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -12,6 +13,7 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@ApiModel(value = "留存率")
 public class RetentionTrendVO {
     @ApiModelProperty(notes = "注册用户留存率=(当天新增的用户中,在注册的第n天还登录的用户数)/新增总用户数")
     private BigDecimal regUserRetentionRate;

+ 1 - 0
game-data/game-data-serve/src/main/resources/mapper/GameMapper.xml

@@ -5,6 +5,7 @@
     <select id="getGameRankingRechargeVO"
             resultType="com.zanxiang.game.data.serve.pojo.vo.GameRankingRechargeGameVO">
         SELECT
+        concat(toString(stat_day),toString(id)) as id,
         id AS gameId,
         game_name AS gameName,
         category AS gameCategory,

+ 1 - 0
game-data/game-data-serve/src/main/resources/mapper/GameUserStatDayMapper.xml

@@ -5,6 +5,7 @@
     <select id="getGameUserRankingRechargeVO"
             resultType="com.zanxiang.game.data.serve.pojo.vo.GameRankingRechargeUserVO">
         select
+        concat(toString(stat_day),toString(id)) as id,
         id as user_id,
         agent_id as regAgent,
         sum(recharge_money_today) as totalRechargeMoney,

+ 1 - 0
game-data/game-data-serve/src/main/resources/mapper/PromoteAgentStatDayMapper.xml

@@ -4,6 +4,7 @@
 
     <select id="getDayDate" resultType="com.zanxiang.game.data.serve.pojo.vo.GamePromoteVO">
         select
+        concat(toString(stat_day),toString(agent_id)) as id,
         agent_id as agentId,
         promote_account_name as accountName,
         promote_account_id as accountId,