|
@@ -2,6 +2,7 @@ package com.zanxiang.game.data.serve.service.impl;
|
|
|
|
|
|
import com.github.sd4324530.jtuple.Tuple2;
|
|
|
import com.google.common.base.CaseFormat;
|
|
|
+import com.zanxiang.erp.security.util.SecurityUtil;
|
|
|
import com.zanxiang.game.data.serve.component.DataPowerComponent;
|
|
|
import com.zanxiang.game.data.serve.pojo.dto.AdsOrderDetailDTO;
|
|
|
import com.zanxiang.game.data.serve.pojo.dto.AdsOrderDetailListDTO;
|
|
@@ -14,6 +15,7 @@ import com.zanxiang.game.data.serve.pojo.vo.AdsOrderDetailVO;
|
|
|
import com.zanxiang.game.data.serve.pojo.vo.OrderCPDetailVO;
|
|
|
import com.zanxiang.game.data.serve.service.IAdsOrderDetailService;
|
|
|
import com.zanxiang.game.data.serve.utils.Page;
|
|
|
+import com.zanxiang.module.util.JsonUtil;
|
|
|
import com.zanxiang.module.util.bean.BeanUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
@@ -45,8 +47,8 @@ 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> gameIds = CollectionUtils.isEmpty(dto.getGameId()) ? poerInfo.second : dto.getGameId();
|
|
|
- String strIds = gameIds.stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
|
- log.error("最终游戏gameIds:{}", strIds);
|
|
|
+// String strIds = gameIds.stream().map(String::valueOf).collect(Collectors.joining(","));
|
|
|
+ log.error("33333, userId:{},gameIds : {}", SecurityUtil.getUserId(),JsonUtil.toString(gameIds));
|
|
|
Criteria cri = Cnd.cri();
|
|
|
if (StringUtils.isNotBlank(dto.getSourceSystem())) {
|
|
|
cri.where().andEquals("source_system", dto.getSourceSystem());
|