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

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

@@ -4537,7 +4537,7 @@ public class GameDataServiceImpl implements IGameDataService {
                       SUM(IF(DATE_ADD(a.dt, INTERVAL %d month) <= DATE(NOW()), cost, 0)),'/',
                       SUM(IF(DATE_ADD(a.dt, INTERVAL %d month) <= DATE(NOW()), %sda1, 0))
                     ) AS amount_m%s ,
-                    """.formatted(month - 1, type, month, type, month - 1, type, month, type, month, month - 1, month - 1, type, month));
+                    """.formatted(month, type, month, type, month - 1, type, month, type, month, month, month, type, month));
         }
 //        //拼接sum数据
         trendDay.append("""

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

@@ -554,7 +554,7 @@ public class IActiveDataServiceImpl implements IActiveDataService {
                                        first_roi,
                                        first_amount_rate,
                                        today_amount_rate,
-                                         new_user_amount_rate as new_user_rate
+                                         new_user_amount_rate as new_user_rate,
                                        first_avg_amount,
                                        today_avg_amount,
                                        paper_avg,

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

@@ -619,6 +619,8 @@ public class PitcherDataServiceImpl implements IPitcherDataService {
         sql.setEntity(dao.getEntity(PitcherDataTotalSumVO.class));
         //执行sql
         dao.execute(sql);
+        // 打印SQL
+        System.out.println("Executing SQL: " + sql.getSourceSql());
         //得到结果
         PitcherDataTotalSumVO vo = sql.getObject(PitcherDataTotalSumVO.class);
         //得到账面相关数据、账面人数、新用户人数、新用户复充人数、创角人数数据

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (发码器后台代码提交05･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (发码器后台代码提交10･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameGiftPackCodeVO.java

@@ -29,7 +29,7 @@ public class GameGiftPackCodeVO {
      * 是否可用
      */
     @ApiModelProperty(notes = "是否可用")
-    private Integer enabled;
+    private Boolean enabled;
 
     /**
      * 创建者