|
@@ -77,7 +77,7 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
|
|
|
Map<Long, PromoAccountDTO> promoAccountMap = promoAccountService.promoAccountCondition(param.getPitcherGroupId(),
|
|
|
param.getPitcherId(), param.getMediaId(), param.getAccount(), param.getAccountType());
|
|
|
//根据条件, 匹配不到账号
|
|
|
- if (gameMap != null && gameMap.isEmpty()) {
|
|
|
+ if (promoAccountMap != null && promoAccountMap.isEmpty()) {
|
|
|
return new Page<>();
|
|
|
}
|
|
|
//相关结果
|
|
@@ -98,6 +98,7 @@ public class PromoChannelServiceImpl extends ServiceImpl<PromoChannelMapper, Pro
|
|
|
.le(param.getEndDate() != null, PromoChannel::getCreateTime, param.getEndDate() == null ? null : LocalDateTime.of(param.getEndDate(), LocalTime.MAX))
|
|
|
.eq(param.getProviderId() != null, PromoChannel::getProviderId, param.getProviderId())
|
|
|
.eq(param.getStatus() != null, PromoChannel::getStatus, param.getStatus())
|
|
|
+ .eq(param.getPromoSiteId() != null, PromoChannel::getPromoSiteId, param.getPromoSiteId())
|
|
|
.orderByDesc(PromoChannel::getCreateTime))
|
|
|
.convert(promoAccount -> this.toVo(promoAccountConditionMap, promoMediaMap, promoAccount, promoSiteMap, gameConditionMap, gameCategoryMap));
|
|
|
}
|