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

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

@@ -48,8 +48,6 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
         Tuple2<List<Long>, List<Long>> poerInfo = dataPowerComponent.getPowerInfo(dto.getSourceSystem());
         List<Long> userIds = dto.getPitcherId() == null ? poerInfo.first : Collections.singletonList(Long.parseLong(dto.getPitcherId()));
         List<Long> paramGameIds = dto.getGameId();
-        log.error("传进来的游戏id：{}", JsonUtil.toStringWithClass(paramGameIds));
-        log.error("拥有权限的游戏id:{}", JsonUtil.toStringWithClass(poerInfo.second));
         if (CollectionUtils.isNotEmpty(paramGameIds)) {
             //将paramGameIds中不在authGameIds中的游戏id过滤掉
             if (poerInfo.second != null) {
@@ -149,6 +147,10 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
             //回传状态
             cri.where().andEquals("back_status", dto.getBackStatus());
         }
+        if (StringUtils.isNotEmpty(dto.getCpName())) {
+            //cp名称
+            cri.where().andLike("cp_name", dto.getCpName());
+        }
         if (StringUtils.isNotBlank(dto.getOrderAgentType())) {
             if ("buy".equals(dto.getOrderAgentType())) {
                 //查询买量数据
@@ -296,6 +298,10 @@ public class AdsOrderDetailServiceImpl implements IAdsOrderDetailService {
             //回传状态
             cri.where().andEquals("back_status", dto.getBackStatus());
         }
+        if (StringUtils.isNotEmpty(dto.getCpName())) {
+            //cp名称
+            cri.where().andLike("cp_name", dto.getCpName());
+        }
         if (StringUtils.isNotBlank(dto.getOrderAgentType())) {
             if ("buy".equals(dto.getOrderAgentType())) {
                 //查询买量数据