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

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

@@ -27,6 +27,7 @@ import org.nutz.dao.sql.Sql;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -147,8 +148,10 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
             }
         }
         //添加判断，除去BG的数据 BG的数据在我们这找不到用户以及渠道
-        cri.where().andNotIsNull("agent_name");
-        cri.where().andNotIsNull("username");
+        if(StringUtils.isNotEmpty(dto.getSourceSystem())&&dto.getSourceSystem().contains("BG")){
+            cri.where().andNotIsNull("agent_name");
+            cri.where().andNotIsNull("username");
+        }
 
         //pager
         Pager pager = dto.toPage();
@@ -292,8 +295,10 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
             }
         }
         //添加判断，除去BG的数据 BG的数据在我们这找不到用户以及渠道
-        cri.where().andNotIsNull("agent_name");
-        cri.where().andNotIsNull("username");
+        if(StringUtils.isNotEmpty(dto.getSourceSystem())&&dto.getSourceSystem().contains("BG")){
+            cri.where().andNotIsNull("agent_name");
+            cri.where().andNotIsNull("username");
+        }
 
         Sql sql = Sqls.create(getOrderDetailTotalSql() + cri);
         sql.setCallback(Sqls.callback.entity());

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

@@ -1053,11 +1053,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
             cri.where().andEquals("is_merge", 0);
         }
         //ture为参与过的 查询数据为1的是参与的 0是未参与的
-        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
-            cri.where().andEquals("is_merge", 1);
-        }else {
-            cri.where().andEquals("is_merge", 0);
-        }
+//        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
+//            cri.where().andEquals("is_merge", 1);
+//        }else {
+//            cri.where().andEquals("is_merge", 0);
+//        }
         //拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "parent_game_id" , "super_game_id");
         //分页
@@ -1187,11 +1187,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
             cri.where().andEquals("source_system", dto.getSourceSystem());
         }
         //原始服可以参与多次合服，只看最新一次的合服的原始服信息  是否参与过合服:1是，0否
-        if(dto.getIsParticipateMerge()!=null&&dto.getIsParticipateMerge()){
-            cri.where().andEquals("is_merge", 1);
-        }else {
+//        if(dto.getIsParticipateMerge()!=null&&dto.getIsParticipateMerge()){
+//            cri.where().andEquals("is_merge", 1);
+//        }else {
             cri.where().andEquals("is_merge", 0);
-        }
+//        }
 
         /*//拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "server_id" , "boss_server_id" , "super_game_id");*/
@@ -1324,11 +1324,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
             cri.where().andEquals("is_merge", 0);
         }
         //ture为参与过的 查询数据为1的是参与的 0是未参与的
-        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
-            cri.where().andEquals("is_merge", 1);
-        }else {
-            cri.where().andEquals("is_merge", 0);
-        }
+//        if (dto.getIsParticipateMerge() != null&&dto.getIsParticipateMerge()) {
+//            cri.where().andEquals("is_merge", 1);
+//        }else {
+//            cri.where().andEquals("is_merge", 0);
+//        }
         /*//拼接分组条件
         cri.getGroupBy().groupBy("source_system" , "boss_server_id" , "super_game_id");*/
         //分页
@@ -2310,12 +2310,11 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         j.send_gift_id as send_gift_id, -- 最新发送礼包id
                         j.is_change_game_type as is_change_game_type, -- 是否转端 1-是；0-否
                         j.is_add_corp_wechat as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
-                     
+                        j.user_phone as user_phone, -- 客户手机号
                         IF(TIMESTAMPDIFF(HOUR, g.update_time, NOW()) > 72,
-                                        IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
+                        IF(TIMESTAMPDIFF(HOUR, f.pay_time, NOW()) < 72 , 0, 1) , 0) as is_remove_game_for_system, -- 是否退游 1-是;0-否(系统判定)
                         j.is_remove_game as is_remove_game, -- 是否退游 1-是;0-否;null-代表未操作数据
                         j.is_wake_up as is_wake_up, -- 是否唤醒 1-是；0-否
-                  
                         j.gs_id as gs_id, -- GS_ID
                         j.customer_service_id as customer_service_id, -- 客服ID
                         j.oper_user_id as oper_user_id, -- 运营ID
@@ -2442,6 +2441,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             role_id,
                             server_id,
                             game_id,
+                            user_phone, -- 客户手机号
                             is_send_mail, -- 是否发送邮件
                             send_gift_id, -- 最新发送礼包id
                             is_change_game_type, -- 是否转端 1-是；0-否