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

@@ -5254,10 +5254,10 @@ public class GameDataServiceImpl implements IGameDataService {
             //订单结束时间默认为消耗结束时间
             dto.setOrderEndDate(dto.getCostEndDate());
             //获取前一天
-            LocalDate twoDaysAgo = dto.getCostEndDate().minusDays(1);
+            LocalDate oneDaysAgo = dto.getCostEndDate().minusDays(1);
             //如果前一天在消耗开始之后或等于，那么就将订单开始时间设置为前一天
-            if(twoDaysAgo.isEqual(dto.getCostBeginDate())||twoDaysAgo.isAfter(dto.getCostBeginDate())){
-                dto.setOrderBeginDate(twoDaysAgo);
+            if(oneDaysAgo.isEqual(dto.getCostBeginDate())||oneDaysAgo.isAfter(dto.getCostBeginDate())){
+                dto.setOrderBeginDate(oneDaysAgo);
             }else {
                 dto.setOrderBeginDate(dto.getCostEndDate());
             }
@@ -5344,11 +5344,13 @@ public class GameDataServiceImpl implements IGameDataService {
             cri.where().andInList(gameColumn, dto.getGameId());
         }
 
-
+        //消耗时间
         if(dto.getCostBeginDate()!=null && dto.getCostEndDate()!=null){
             cri.where().andBetween("to_date(reg_time)", dto.getCostBeginDate(), dto.getCostEndDate());
         }
 
+
+
         //拼接投手ID
         if (CollectionUtils.isNotEmpty(dto.getPitcherId())) {
             cri.where().andInList("pitcher_id", dto.getPitcherId());
@@ -5434,6 +5436,7 @@ public class GameDataServiceImpl implements IGameDataService {
                                                                   game_id,
                                                                   account_type
                                                             from game_dw.dw_agent_day
+                                                            """ + agentCri + """
                                                            group by source_system, dt, pitcher_id, agent_id,account_id, game_id, account_type
                                                            ) a left join (
                                                                            select
@@ -5609,7 +5612,6 @@ public class GameDataServiceImpl implements IGameDataService {
                                 ) f
                                                group by day, source_system
                                      ) ab  
-                                     """+ agentCri +""" 
                                      order by day desc
                 
                 
@@ -5658,7 +5660,7 @@ public class GameDataServiceImpl implements IGameDataService {
         Criteria criCost = Cnd.cri();
         //拼接查询时间
         if (dto.getCostBeginDate() != null && dto.getCostEndDate() != null) {
-            criCost.where().andBetween("day", dto.getCostBeginDate(), dto.getCostBeginDate());
+            criCost.where().andBetween("day", dto.getCostBeginDate(), dto.getCostEndDate());
         }
 
         String gameColumn = "game_id";
@@ -5731,6 +5733,7 @@ public class GameDataServiceImpl implements IGameDataService {
                                                   game_id,
                                                   account_type
                                             from game_dw.dw_agent_day
+                                            """+ agentCri +"""
                                            group by source_system, dt, pitcher_id, agent_id,account_id, game_id, account_type
                                            ) a left join (
                                                            select
@@ -5907,7 +5910,7 @@ public class GameDataServiceImpl implements IGameDataService {
                 ) f
                                group by day, source_system
                      ) ab  
-                     """+ agentCri +"""
+                     
                      order by day desc
                     
                     """;
@@ -5942,7 +5945,7 @@ public class GameDataServiceImpl implements IGameDataService {
 
         //拼接查询时间
         if (dto.getOrderBeginDate() != null && dto.getOrderEndDate() != null) {
-            cri.where().andBetween("day", dto.getOrderBeginDate(), dto.getOrderEndDate());
+            cri.where().andBetween("dt", dto.getOrderBeginDate(), dto.getOrderEndDate());
         }
 
 
@@ -5990,7 +5993,7 @@ public class GameDataServiceImpl implements IGameDataService {
         if (dto.getOrderBeginDate() != null && dto.getOrderEndDate() != null) {
             cri.where().andBetween("day", dto.getOrderBeginDate(), dto.getOrderEndDate());
         }
-
+        //消耗时间
         if(dto.getCostBeginDate()!=null && dto.getCostEndDate()!=null){
             cri.where().andBetween("to_date(reg_time)", dto.getCostBeginDate(), dto.getCostEndDate());
         }