Merge branch 'dev' of GameCenter/game-center into master

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsGameAccountDayn.java

@@ -5,6 +5,7 @@ import org.nutz.dao.entity.annotation.Column;
 import org.nutz.dao.entity.annotation.PK;
 import org.nutz.dao.entity.annotation.Table;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDate;
 
@@ -12,6 +13,7 @@ import java.time.LocalDate;
 @Table(AdsGameAccountDayn.TABLE_NAME)
 @PK({"dt", "gameId", "accountType", "sourceSystem"})
 public class AdsGameAccountDayn implements Serializable {
+    @Serial
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_game_account_dayn";
      
@@ -39,7 +41,7 @@ public class AdsGameAccountDayn implements Serializable {
     * 每一天的的充值金额，充值次数，充值人数
     */
     @Column
-    private String dayn;
+    private String dayN;
 
 }
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsGamePitcherAccountDayn.java

@@ -5,6 +5,7 @@ import org.nutz.dao.entity.annotation.Column;
 import org.nutz.dao.entity.annotation.PK;
 import org.nutz.dao.entity.annotation.Table;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDate;
 
@@ -12,6 +13,7 @@ import java.time.LocalDate;
 @Table(AdsGamePitcherAccountDayn.TABLE_NAME)
 @PK({"dt", "gameId", "pitcherId", "accountType", "sourceSystem"})
 public class AdsGamePitcherAccountDayn implements Serializable {
+    @Serial
     private static final long serialVersionUID = 1L;
     public static final String TABLE_NAME = "ads_game_pitcher_account_dayn";
      
@@ -44,7 +46,7 @@ public class AdsGamePitcherAccountDayn implements Serializable {
     * 每一天的的充值金额，充值次数，充值人数
     */    
     @Column
-    private String dayn;
+    private String dayN;
     
 
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsPitcherAccountDayn.java

@@ -39,7 +39,7 @@ public class AdsPitcherAccountDayn implements Serializable {
     * 每一天的的充值金额，充值次数，充值人数
     */    
     @Column
-    private String dayn;
+    private String dayN;
     
 
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsPitcherDayn.java

@@ -34,7 +34,7 @@ public class AdsPitcherDayn implements Serializable {
     * 每一天的的充值金额，充值次数，充值人数
     */    
     @Column
-    private String dayn;
+    private String dayN;
     
 
 }

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/entity/AdsPitcherGameDayn.java

@@ -39,7 +39,7 @@ public class AdsPitcherGameDayn implements Serializable {
     * 每一天的的充值金额，充值次数，充值人数
     */    
     @Column
-    private String dayn;
+    private String dayN;
     
 
 }

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

@@ -986,7 +986,7 @@ public class AccountAgentDayServiceImpl implements IAccountAgentDayService {
         newUserNumMap.put("rechargeBeginDay", dto.getRechargeBeginDay());
         newUserNumMap.put("rechargeEndDay", dto.getRechargeEndDay());
         Sql sqlDayN = Sqls.queryString("""
-                select dayN
+                select day_n as dayN
                 from ads_dayn_amount
                 where
                 dt>=@beginDay and dt<=@endDay

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

@@ -1462,7 +1462,7 @@ public class GameDataServiceImpl implements IGameDataService {
                         dt,
                         game_id,
                         source_system,
-                        dayN as day_n
+                        day_n
                     FROM
                         $tableName
                     """ + cri);
@@ -1472,7 +1472,7 @@ public class GameDataServiceImpl implements IGameDataService {
                         dt,
                         parent_game_id as game_id,
                         source_system,
-                        dayN as day_n
+                        day_n
                     FROM
                         $tableName
                     """ + cri);
@@ -1559,7 +1559,7 @@ public class GameDataServiceImpl implements IGameDataService {
                         dt,
                         game_id,
                         source_system,
-                        dayN as day_n
+                        day_n
                     FROM
                         $tableName
                     """ + cri);
@@ -1569,7 +1569,7 @@ public class GameDataServiceImpl implements IGameDataService {
                         dt,
                         parent_game_id as game_id,
                         source_system,
-                        dayN as day_n
+                        day_n
                     FROM
                         $tableName
                     """ + cri);
@@ -1896,7 +1896,7 @@ public class GameDataServiceImpl implements IGameDataService {
 
         Sql dayNSql = Sqls.create("""
                 SELECT
-                    dayN
+                    day_n as dayN
                 FROM
                     $tableName
                 """ + cri);
@@ -2005,7 +2005,7 @@ public class GameDataServiceImpl implements IGameDataService {
 
         Sql dayNSql = Sqls.create("""
                 SELECT
-                    dayN
+                    day_n as dayN
                 FROM
                     $tableName
                 """ + cri);
@@ -10508,7 +10508,7 @@ public class GameDataServiceImpl implements IGameDataService {
 
     private H5DayN getImportNatureH5DayN(GameDataH5DTO dto, Map<String, Object> dayNMap, Map<String, Object> natureNewUserMap) {
         Sql importNatureSqlDayN = Sqls.queryString("""
-                select dayN from ads_dayn_h5_lead_nature_game
+                select day_n as dayN from ads_dayn_h5_lead_nature_game
                 where
                 dt>=@beginDay and dt<=@endDay
                 and source_system = @sourceSystem
@@ -10575,7 +10575,7 @@ public class GameDataServiceImpl implements IGameDataService {
 
     private H5DayN getImportBuyH5DayN(GameDataH5DTO dto, Map<String, Object> dayNMap, Map<String, Object> buyNewUserMap) {
         Sql importBuySqlDayN = Sqls.queryString("""
-                select dayN from ads_dayn_h5_lead_buy_game
+                select day_n as dayN from ads_dayn_h5_lead_buy_game
                 where
                 dt>=@beginDay and dt<=@endDay
                 and source_system = @sourceSystem
@@ -10642,7 +10642,7 @@ public class GameDataServiceImpl implements IGameDataService {
 
     private H5DayN getNatureH5DayN(GameDataH5DTO dto, Map<String, Object> dayNMap) {
         Sql natureSqlDayN = Sqls.queryString("""
-                select dayN from ads_dayn_h5_nature_game
+                select day_n as dayN from ads_dayn_h5_nature_game
                 where
                 dt>=@beginDay and dt<=@endDay
                 and source_system = @sourceSystem
@@ -10715,7 +10715,7 @@ public class GameDataServiceImpl implements IGameDataService {
     private H5DayN getH5PayDayN(GameDataH5DTO dto, Map<String, Object> dayNMap) {
         H5DayN h5PayDayN = null;
         Sql paySqlDayN = Sqls.queryString("""
-                select dayN from ads_dayn_h5_pay_game
+                select day_n as dayN from ads_dayn_h5_pay_game
                 where
                 dt>=@beginDay and dt<=@endDay
                 and source_system = @sourceSystem

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

@@ -1669,7 +1669,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     pitcher_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads.ads_game_pitcher_account_dayn
                 """ + cri);
@@ -1681,7 +1681,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     pitcher_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads_parent.ads_game_pitcher_account_dayn_parent
                 """ + cri);
@@ -1755,7 +1755,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     pitcher_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM 
                 """ +tableName + cri);
 
@@ -1828,7 +1828,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     game_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads.ads_game_account_dayn
                 """ + cri);
@@ -1839,7 +1839,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     parent_game_id as game_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads_parent.ads_game_account_dayn_parent
                 """ + cri);
@@ -1919,7 +1919,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     pitcher_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads.ads_game_pitcher_account_dayn
                 """ + cri);
@@ -1931,7 +1931,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     pitcher_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads_parent.ads_game_pitcher_account_dayn_parent
                 """ + cri);
@@ -1989,7 +1989,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     pitcher_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM 
                 """ +tableName + cri);
 
@@ -2049,7 +2049,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     game_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads.ads_game_account_dayn
                 """ + cri);
@@ -2060,7 +2060,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
                     parent_game_id as game_id,
                     source_system,
                     account_type,
-                    dayN
+                    day_n
                 FROM
                     game_ads_parent.ads_game_account_dayn_parent
                 """ + cri);
@@ -2095,7 +2095,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
     private String parseJsonData(AdsGamePitcherAccountDayn adsGamePitcherAccountDayn, String dataStr, PitcherGameMediaDataTotalDTO dto) {
         //将每一个adsDaynGame中的dayN属性值 由json转为 Map 型
         Gson gson = new Gson();
-        Map<String, String> jsonList = gson.fromJson(adsGamePitcherAccountDayn.getDayn(), Map.class);
+        Map<String, String> jsonList = gson.fromJson(adsGamePitcherAccountDayn.getDayN(), Map.class);
         //解析 jsonList
         for (Map.Entry<String, String> entry : jsonList.entrySet()) {
             //key是充值日期
@@ -2129,7 +2129,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
     private String parseJsonDataPitcher(AdsPitcherAccountDayn adsPitcherAccountDayn, String dataStr, PitcherMediaDataTotalDTO dto) {
         //将每一个adsDaynGame中的dayN属性值 由json转为 Map 型
         Gson gson = new Gson();
-        Map<String, String> jsonList = gson.fromJson(adsPitcherAccountDayn.getDayn(), Map.class);
+        Map<String, String> jsonList = gson.fromJson(adsPitcherAccountDayn.getDayN(), Map.class);
         //解析 jsonList
         for (Map.Entry<String, String> entry : jsonList.entrySet()) {
             //key是充值日期
@@ -2163,7 +2163,7 @@ public class IMediaDataServiceImpl implements IMediaDataService {
     private String parseJsonDataGame(AdsGameAccountDayn adsGameAccountDayn, String dataStr, GameMediaDataTotalDTO dto) {
         //将每一个adsDaynGame中的dayN属性值 由json转为 Map 型
         Gson gson = new Gson();
-        Map<String, String> jsonList = gson.fromJson(adsGameAccountDayn.getDayn(), Map.class);
+        Map<String, String> jsonList = gson.fromJson(adsGameAccountDayn.getDayN(), Map.class);
         //解析 jsonList
         for (Map.Entry<String, String> entry : jsonList.entrySet()) {
             //key是充值日期

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

@@ -1690,8 +1690,8 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     dt,
                     pitcher_id,
                     source_system,
-                    dayN
-                FROM 
+                    day_n
+                FROM
                 """ + tableName + cri);
 
         //设置回传
@@ -1754,7 +1754,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                         game_id,
                         pitcher_id,
                         source_system,
-                        dayN
+                        day_n
                     FROM
                         game_ads.ads_pitcher_game_dayn
                     """ + cri);
@@ -1765,7 +1765,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                         parent_game_id as game_id,
                         pitcher_id,
                         source_system,
-                        dayN
+                        day_n
                     FROM
                         game_ads_parent.ads_pitcher_game_dayn_parent
                     """ + cri);
@@ -1834,7 +1834,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                     dt,
                     pitcher_id,
                     source_system,
-                    dayN
+                    day_n
                 FROM 
                 """ + tableName + cri);
 
@@ -1895,7 +1895,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                         game_id,
                         pitcher_id,
                         source_system,
-                        dayN
+                        day_n
                     FROM
                         game_ads.ads_pitcher_game_dayn
                     """ + cri);
@@ -1906,7 +1906,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
                         parent_game_id as game_id,
                         pitcher_id,
                         source_system,
-                        dayN
+                        day_n
                     FROM
                         game_ads_parent.ads_pitcher_game_dayn_parent
                     """ + cri);
@@ -1943,7 +1943,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
     private void parseJsonDataPitcher(AdsPitcherDayn adsPitcherDayn, Map<String, String> resMap, PitcherDataTotalDTO dto) {
         //将每一个adsDaynGame中的dayN属性值 由json转为 Map 型
         Gson gson = new Gson();
-        Map<String, String> jsonList = gson.fromJson(adsPitcherDayn.getDayn(), Map.class);
+        Map<String, String> jsonList = gson.fromJson(adsPitcherDayn.getDayN(), Map.class);
         //解析 jsonList
         for (Map.Entry<String, String> entry : jsonList.entrySet()) {
             //key是充值日期
@@ -1992,7 +1992,7 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
     private void parseJsonData(AdsPitcherGameDayn adsPitcherGameDayn, Map<String, String> resMap, PitcherGameDataTotalDTO dto) {
         //将每一个adsDaynGame中的dayN属性值 由json转为 Map 型
         Gson gson = new Gson();
-        Map<String, String> jsonList = gson.fromJson(adsPitcherGameDayn.getDayn(), Map.class);
+        Map<String, String> jsonList = gson.fromJson(adsPitcherGameDayn.getDayN(), Map.class);
         //解析 jsonList
         for (Map.Entry<String, String> entry : jsonList.entrySet()) {
             //key是充值日期