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

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/vo/AdsOrderDetailVO.java

@@ -235,4 +235,20 @@ public class AdsOrderDetailVO {
     @ApiModelProperty(notes = "角色注册7日内订单数")
     private Long roleOrder7DayTotal;
 
+    /**
+     * 投放类型
+     */
+    private String putType;
+
+    /**
+     * 游戏类型
+     */
+    private String category;
+
+    /**
+     * 拆单笔数
+     */
+    private Long backCount;
+
+
 }

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

@@ -42,6 +42,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
     private Dao dao;
     @Autowired
     private DataPowerComponent dataPowerComponent;
+
     @Override
     public Page<AdsOrderDetailVO> listOfPage(AdsOrderDetailListDTO dto) {
         Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
@@ -372,7 +373,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
      *
      * @return String
      */
-   ////                	LEFT JOIN dm_game_order.t_game_user_role ab
+    ////                	LEFT JOIN dm_game_order.t_game_user_role ab
     ////                	on a.source_system = ab.source_system AND a.role_id = ab.role_id AND a.user_id = ab.user_id and a.game_id = ab.game_id
     private String getOrderDetailSql() {
         return """
@@ -403,6 +404,8 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                 		a.game_id as order_game_id, -- 玩家充值游戏ID
                 		f.game_name as order_game_name,-- 玩家充值游戏名
                 		f.classify as order_game_classify,-- 玩家充值游戏类型
+                		f.category as category,                -- 游戏类型
+                		f.put_type as put_type,                -- 投放类型
                 		a.product_id , -- 充值商品ID
                 		a.product_name , -- 充值商品名称
                 		a.amount , -- 订单金额
@@ -437,7 +440,8 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                  		IFNULL(l.back_money / 100, null) as back_money, -- 回传金额
                  		l.back_msg as back_msg, -- 回传信息
                  		l.id as back_id, -- 回传id
-                 		l.back_table_name as back_table_name -- 回传表名
+                 		l.back_table_name as back_table_name, -- 回传表名
+                 		n.back_count -- 拆单笔数
                 	FROM dm_game_order.t_game_order a
 
                 	LEFT JOIN dm_game_order.t_game_user_burst b
@@ -484,32 +488,56 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                 		GROUP BY role_id , source_system,user_id
                 	) k on a.source_system = k.source_system AND a.role_id = k.role_id and a.user_id = k.user_id
                 	LEFT JOIN (
-                		SELECT
-                			id,
-                			order_no as order_id,
-                			back_status,
-                			back_msg,
-                			back_money,
-                			'byte' as back_table_name
-                		FROM dm_ad_byte.t_game_oceanengine_order_log
-                		UNION ALL
-                		SELECT
-                			id,
-                			order_id ,
-                			back_status,
-                			back_msg,
-                			back_money,
-                			'tencent_mini' as back_table_name
-                		FROM dm_ad_tencent.t_game_tencent_mini_game_order
-                		UNION ALL
-                		SELECT
-                			id,
-                			order_id ,
-                			is_back as back_status,
-                			back_msg,
-                			back_money,
-                			'tencent_h5' as back_table_name
-                		FROM dm_ad_tencent.t_game_tencent_order
+                		SELECT id,
+                         order_no as order_id,
+                         back_status,
+                         back_msg,
+                         back_money,
+                         'byte'   as back_table_name
+                        FROM dm_ad_byte.t_game_oceanengine_order_log
+                         UNION ALL
+                       SELECT id,
+                         order_id,
+                         back_status,
+                         back_msg,
+                         back_money,
+                         'tencent_mini' as back_table_name
+                       FROM dm_ad_tencent.t_game_tencent_mini_game_order
+                         UNION ALL
+                       SELECT id,
+                         order_id,
+                         is_back      as back_status,
+                         back_msg,
+                         back_money,
+                         'tencent_h5' as back_table_name
+                       FROM dm_ad_tencent.t_game_tencent_order
+                         UNION ALL
+                      SELECT
+                          id,
+                          order_no as order_id,
+                          back_status,
+                          back_msg,
+                          back_money,
+                          'oceanengine_app' as back_table_name
+                      FROM dm_ad_byte.t_game_oceanengine_app_order_log
+                         UNION ALL
+                      SELECT
+                          id,
+                          order_id,
+                          is_back as  back_status,
+                          back_msg,
+                           back_money,
+                          'tencent_app' as back_table_name
+                      FROM dm_ad_tencent.t_game_tencent_app_order
+                         UNION ALL
+                     SELECT
+                         id,
+                         order_id,
+                         is_back as back_status,
+                         back_msg,
+                          back_money,
+                         'tencent_app_api' as back_table_name
+                     FROM dm_ad_tencent.t_game_tencent_app_api_order
                 	) l on a.order_id = l.order_id
                 	LEFT JOIN (
                 		SELECT
@@ -537,6 +565,32 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                 		AND DATE(a.pay_time) BETWEEN DATE(role_create_time) AND DATE_ADD(DATE(role_create_time) ,INTERVAL 7 DAY)
                 		GROUP BY a.source_system ,a.role_id
                 	) m on a.source_system = m.source_system AND a.role_id = m.role_id
+                	   left join (
+                	        SELECT
+                	               order_no as order_id,
+                                   any_value(back_count) back_count
+                            FROM dm_ad_byte.t_game_oceanengine_app_order_split_log group by order_no
+                          union all
+                             SELECT
+                                   order_no as order_id,
+                                   any_value(back_count)
+                            FROM dm_ad_byte.t_game_oceanengine_order_split_log group by order_no
+                         union all
+                            SELECT
+                                   order_no as order_id,
+                                   any_value(back_count)
+                         FROM dm_ad_tencent.t_game_tencent_app_order_split_log group by order_no
+                        union all
+                             SELECT
+                                    order_no as order_id,
+                                    any_value(back_count)
+                         FROM dm_ad_tencent.t_game_tencent_mini_game_order_split_log group by order_no
+                        union all
+                             SELECT
+                                    order_no as order_id,
+                                    any_value(back_count)
+                         FROM dm_ad_tencent.t_game_tencent_order_split_log group by order_no
+                        ) n on n.order_id = l.order_id
                 ) a
                 """;
     }
@@ -613,7 +667,7 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
                  		l.id as back_id, -- 回传id
                  		l.back_table_name as back_table_name -- 回传表名
                 	FROM dm_game_order.t_game_order a
-                
+                                
                 	LEFT JOIN dm_game_order.t_game_user_burst b
                 	on a.source_system = b.source_system AND a.user_id = b.id AND a.create_time >= b.create_time AND a.create_time <b.end_time
                 	LEFT JOIN dm_game_order.t_pitcher_agent c on a.source_system = c.source_system AND a.agent_id = c.id

game-gs-data/game-gs-data-serve/src/main/java/com/zanxiang/game/gs/data/serve/controller/GameParentController.java

@@ -1,6 +1,7 @@
 package com.zanxiang.game.gs.data.serve.controller;
 
 import com.mybatisflex.core.row.Row;
+import com.zanxiang.erp.security.annotation.PreAuthorize;
 import com.zanxiang.game.gs.data.serve.pojo.dto.*;
 import com.zanxiang.game.gs.data.serve.pojo.vo.*;
 import com.zanxiang.game.gs.data.serve.service.IAdsGsServerDayParentService;
@@ -32,56 +33,56 @@ public class GameParentController {
     private IAdsServerRankingParentService serverRankingParentService;
 
     @ApiOperation(value = "大R每日充值比")
-//    @PreAuthorize(permissionKey = "gameGs:bigR:list")
+    @PreAuthorize(permissionKey = "gameGs:bigR:list")
     @PostMapping("/bigR/listOfPage")
     public ResultVO<PageVO<BigRVO, Row>> bigRListOfPage(@Validated @RequestBody BigRDTO dto) {
         return ResultVO.ok(adsRoleAmountDataParentService.bigRListOfPage(dto));
     }
 
     @ApiOperation(value = "GS角色付费留存")
-//    @PreAuthorize(permissionKey = "gameGs:rolePay:list")
+    @PreAuthorize(permissionKey = "gameGs:rolePay:list")
     @PostMapping("/role/pay/retained/listOfPage")
     public ResultVO<PageVO<RolePayVO, Row>> rolePay(@Validated @RequestBody RolePayDTO dto) {
         return ResultVO.ok(adsRoleAmountRateParentService.rolePayOfPage(dto));
     }
 
     @ApiOperation(value = "GS角色付费留存总计")
-//    @PreAuthorize(permissionKey = "gameGs:rolePay:total")
+    @PreAuthorize(permissionKey = "gameGs:rolePay:total")
     @PostMapping("/role/pay/retained/total")
     public ResultVO<RolePayVO> rolePayTotal(@Validated @RequestBody RolePayDTO dto) {
         return ResultVO.ok(adsRoleAmountRateParentService.rolePayTotal(dto));
     }
 
     @ApiOperation(value = "GS区服付费留存")
-//    @PreAuthorize(permissionKey = "gameGs:serverPay:list")
+    @PreAuthorize(permissionKey = "gameGs:serverPay:list")
     @PostMapping("/server/pay/retained/listOfPage")
     public ResultVO<PageVO<ServerPayVO, Row>> serverPay(@Validated @RequestBody ServerPayDTO dto) {
         return ResultVO.ok(gsServerDayParentService.serverPay(dto));
     }
 
     @ApiOperation(value = "GS区服付费留存总计")
-//    @PreAuthorize(permissionKey = "gameGs:serverPay:total")
+    @PreAuthorize(permissionKey = "gameGs:serverPay:total")
     @PostMapping("/server/pay/retained/total")
     public ResultVO<ServerPayVO> serverPayTotal(@Validated @RequestBody ServerPayDTO dto) {
         return ResultVO.ok(gsServerDayParentService.serverPayTotal(dto));
     }
 
     @ApiOperation(value = "角色流失监控")
-//    @PreAuthorize(permissionKey = "gameGs:roleRemoveGame:monitor")
+    @PreAuthorize(permissionKey = "gameGs:roleRemoveGame:monitor")
     @PostMapping("/role/remove/game/monitor")
     public ResultVO<PageVO<RoleRemoveGameMonitorVO, Row>> roleRemoveGameMonitor(@Validated @RequestBody RoleRemoveGameMonitorDTO dto) {
         return ResultVO.ok(adsRoleAmountDataParentService.roleRemoveGameMonitor(dto));
     }
 
     @ApiOperation(value = "游戏角色管理")
-//    @PreAuthorize(permissionKey = "gameGs:role:manage")
+    @PreAuthorize(permissionKey = "gameGs:role:manage")
     @PostMapping("/role/manage")
     public ResultVO<PageVO<RoleManageVO, Row>> roleManage(@Validated @RequestBody RoleManageDTO dto) {
         return ResultVO.ok(adsRoleAmountDataParentService.roleManage(dto));
     }
 
     @ApiOperation(value = "游戏区服管理")
-//    @PreAuthorize(permissionKey = "gameGs:serve:manage")
+    @PreAuthorize(permissionKey = "gameGs:serve:manage")
     @PostMapping("/serve/manage")
     public ResultVO<PageVO<ServeManageVO, Row>> serveManage(@Validated @RequestBody ServeManageDTO dto) {
         return ResultVO.ok(serverRankingParentService.serveManage(dto));