:fix:订单bug修复

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());