|
@@ -200,7 +200,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
Tuple2<List<Long>, List<AgentDTO>> tuple2 = agentService.getUserAgent(param.getAccountId(), param.getPitcherId(), param.getChannelId());
|
|
|
List<Long> agentIdList = tuple2.getT1();
|
|
|
List<AgentDTO> agentDTOList = tuple2.getT2();
|
|
|
- if (Objects.equals(gameTuple.getT1(), GameAuthEnum.OPERATE.getValue()) && CollectionUtils.isEmpty(agentIdList)) {
|
|
|
+ if (Objects.equals(gameTuple.getT1(), GameAuthEnum.PITCHER.getValue()) && CollectionUtils.isEmpty(agentIdList)) {
|
|
|
return new Page<>();
|
|
|
}
|
|
|
Map<Long, CpDTO> cpMap = cpService.cpMap();
|
|
@@ -223,7 +223,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
|
|
|
.gt(Objects.equals(param.getIsRecharge(), Boolean.TRUE), User::getRechargeCount, 0)
|
|
|
.eq(Objects.equals(param.getIsRecharge(), Boolean.FALSE), User::getRechargeCount, 0)
|
|
|
.eq(param.getStatus() != null, User::getStatus, param.getStatus())
|
|
|
- .in(Objects.equals(gameTuple.getT1(), GameAuthEnum.OPERATE.getValue()), User::getAgentId, agentIdList)
|
|
|
+ .in(Objects.equals(gameTuple.getT1(), GameAuthEnum.PITCHER.getValue()), User::getAgentId, agentIdList)
|
|
|
.apply(param.getRegPayIntervalTimeMin() != null, "if(last_recharge_time is not null, TIMESTAMPDIFF(minute, create_time, last_recharge_time), null) >= {0}", param.getRegPayIntervalTimeMin())
|
|
|
.apply(param.getRegPayIntervalTimeMax() != null, "if(last_recharge_time is not null, TIMESTAMPDIFF(minute, create_time, last_recharge_time), null) <= {0}", param.getRegPayIntervalTimeMax())
|
|
|
.orderByDesc(User::getCreateTime)
|