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

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);
         //得到账面相关数据、账面人数、新用户人数、新用户复充人数、创角人数数据