订单添加字段-回传相关修改

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

@@ -214,4 +214,16 @@ public class AdsOrderDetailVO {
     @ApiModelProperty(notes = "回传信息")
     private String backMsg;
 
+    /**
+     * 回传表名
+     */
+    @ApiModelProperty(notes = "回传表名")
+    private String backTableName;
+
+    /**
+     * 回传所需id
+     */
+    @ApiModelProperty(notes = "回传所需id")
+    private Long backId;
+
 }

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

@@ -413,9 +413,11 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		IF(a.status = 2, IF(a.create_time = i.create_time, 1, 0), 0) as is_first_recharge, -- 是否首充
                 		IF(a.promotion_id = 'null', NULL, a.promotion_id) as promotion_id , -- 计划ID
                   		IF(a.project_id = 'null' , NULL, a.project_id) as project_id, -- 项目ID（广告ID）
-                  		IFNULL(l.back_status, IFNULL(m.back_status, IFNULL(n.is_back, 2))) as back_status, -- 订单的回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
-                  		IFNULL(l.back_money, IFNULL(m.back_money, n.back_money)) as back_money, -- 订单回传金额
-                  		IFNULL(l.back_msg, IFNULL(m.back_msg, n.back_msg)) as back_msg -- 回传信息
+                 		IFNULL(l.back_status, 2) as back_status, -- 回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
+                 		l.back_money as back_money, -- 回传金额
+                 		l.back_msg as back_msg, -- 回传信息
+                 		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 b on a.source_system = b.source_system AND a.user_id = b.id
                 	LEFT JOIN dm_game_order.t_pitcher_agent c on a.source_system = c.source_system AND a.agent_id = c.id
@@ -460,28 +462,32 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 	) k on a.source_system = k.source_system AND a.role_id = k.role_id
                 	LEFT JOIN (
                 		SELECT
-                			order_no,
+                			id,
+                			order_no as order_id,
                 			back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'byte' as back_table_name
                 		FROM dm_ad_byte.t_game_oceanengine_order_log
-                	) l on a.order_id = l.order_no
-                	LEFT JOIN (
+                		UNION ALL
                 		SELECT
+                			id,
                 			order_id ,
                 			back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'tencent_mini' as back_table_name
                 		FROM dm_ad_tencent.t_game_tencent_mini_game_order
-                	) m on a.order_id = m.order_id
-                	LEFT JOIN (
+                		UNION ALL
                 		SELECT
+                			id,
                 			order_id ,
-                			is_back,
+                			is_back as back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'tencent_h5' as back_table_name
                 		FROM dm_ad_tencent.t_game_tencent_order
-                	) n on a.order_id = n.order_id
+                	) l on a.order_id = l.order_id
                 ) a
                 """;
     }
@@ -548,9 +554,11 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		IF(a.status = 2, IF(a.create_time = i.create_time, 1, 0), 0) as is_first_recharge, -- 是否首充
                 		IF(a.promotion_id = 'null', NULL, a.promotion_id) as promotion_id , -- 计划ID
                   		IF(a.project_id = 'null' , NULL, a.project_id) as project_id, -- 项目ID（广告ID）
-                        IFNULL(l.back_status, IFNULL(m.back_status, IFNULL(n.is_back, 2))) as back_status, -- 订单的回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
-                  		IFNULL(l.back_money, IFNULL(m.back_money, n.back_money)) as back_money, -- 订单回传金额
-                  		IFNULL(l.back_msg, IFNULL(m.back_msg, n.back_msg)) as back_msg -- 回传信息
+                 		IFNULL(l.back_status, 2) as back_status, -- 回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
+                 		l.back_money as back_money, -- 回传金额
+                 		l.back_msg as back_msg, -- 回传信息
+                 		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 b on a.source_system = b.source_system AND a.user_id = b.id
                 	LEFT JOIN dm_game_order.t_pitcher_agent c on a.source_system = c.source_system AND a.agent_id = c.id
@@ -595,28 +603,32 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 	) k on a.source_system = k.source_system AND a.role_id = k.role_id
                 	LEFT JOIN (
                 		SELECT
-                			order_no,
+                			id,
+                			order_no as order_id,
                 			back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'byte' as back_table_name
                 		FROM dm_ad_byte.t_game_oceanengine_order_log
-                	) l on a.order_id = l.order_no
-                	LEFT JOIN (
+                		UNION ALL
                 		SELECT
+                			id,
                 			order_id ,
                 			back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'tencent_mini' as back_table_name
                 		FROM dm_ad_tencent.t_game_tencent_mini_game_order
-                	) m on a.order_id = m.order_id
-                	LEFT JOIN (
+                		UNION ALL
                 		SELECT
+                			id,
                 			order_id ,
-                			is_back,
+                			is_back as back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'tencent_h5' as back_table_name
                 		FROM dm_ad_tencent.t_game_tencent_order
-                	) n on a.order_id = n.order_id
+                	) l on a.order_id = l.order_id
                 ) a
                 """;
     }
@@ -684,9 +696,11 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 		IF(a.status = 2, IF(a.create_time = i.create_time, 1, 0), 0) as is_first_recharge, -- 是否首充
                 		IF(a.promotion_id = 'null', NULL, a.promotion_id) as promotion_id , -- 计划ID
                   		IF(a.project_id = 'null' , NULL, a.project_id) as project_id, -- 项目ID（广告ID）
-                  		IFNULL(l.back_status, IFNULL(m.back_status, IFNULL(n.is_back, 2))) as back_status, -- 订单的回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
-                  		IFNULL(l.back_money, IFNULL(m.back_money, n.back_money)) as back_money, -- 订单回传金额
-                  		IFNULL(l.back_msg, IFNULL(m.back_msg, n.back_msg)) as back_msg -- 回传信息
+                 		IFNULL(l.back_status, 2) as back_status, -- 回传状态：-1-回传失败;0-未回传;1-已回传;2-没有回传数据
+                 		l.back_money as back_money, -- 回传金额
+                 		l.back_msg as back_msg, -- 回传信息
+                 		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 b on a.source_system = b.source_system AND a.user_id = b.id
                 	LEFT JOIN dm_game_order.t_pitcher_agent c on a.source_system = c.source_system AND a.agent_id = c.id
@@ -731,28 +745,32 @@ public class AdsOrderDetailService implements IAdsOrderDetailService {
                 	) k on a.source_system = k.source_system AND a.role_id = k.role_id
                 	LEFT JOIN (
                 		SELECT
-                			order_no,
+                			id,
+                			order_no as order_id,
                 			back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'byte' as back_table_name
                 		FROM dm_ad_byte.t_game_oceanengine_order_log
-                	) l on a.order_id = l.order_no
-                	LEFT JOIN (
+                		UNION ALL
                 		SELECT
+                			id,
                 			order_id ,
                 			back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'tencent_mini' as back_table_name
                 		FROM dm_ad_tencent.t_game_tencent_mini_game_order
-                	) m on a.order_id = m.order_id
-                	LEFT JOIN (
+                		UNION ALL
                 		SELECT
+                			id,
                 			order_id ,
-                			is_back,
+                			is_back as back_status,
                 			back_msg,
-                			back_money
+                			back_money,
+                			'tencent_h5' as back_table_name
                 		FROM dm_ad_tencent.t_game_tencent_order
-                	) n on a.order_id = n.order_id
+                	) l on a.order_id = l.order_id
                 ) a
                 """;
     }