|
@@ -138,6 +138,8 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
|
|
|
*/
|
|
|
@Override
|
|
|
public Page<PromotionDayVO> getPromotionDayData(PromotionDayDTO dto) {
|
|
|
+ long[] userIds = dto.getPitcherId() == null ? dataPowerComponent.getSubUserIdList() : new long[]{dto.getPitcherId()};
|
|
|
+ long[] gameIds = dto.getGameId() == null ? dataPowerComponent.getSubGameIdList() : new long[]{dto.getGameId()};
|
|
|
//如果没有排序条件给默认值
|
|
|
if (StringUtils.isBlank(dto.getSortFiled())) {
|
|
|
dto.setSortFiled("today_cost");
|
|
@@ -145,8 +147,8 @@ public class PromotionDayServiceImpl implements IAdsPromotionDayService {
|
|
|
if (StringUtils.isBlank(dto.getSortType())) {
|
|
|
dto.setSortType(OrderByEnum.DESC.getOrderType());
|
|
|
}
|
|
|
- Criteria criA = myCri(dto, true);
|
|
|
- Criteria criB = myCri(dto, false);
|
|
|
+ Criteria criA = myCri(userIds, gameIds, dto, true);
|
|
|
+ Criteria criB = myCri(userIds, gameIds, dto, false);
|
|
|
Criteria criOrderBy = Cnd.cri();
|
|
|
//拼接排序条件
|
|
|
criOrderBy.getOrderBy().orderBy(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, dto.getSortFiled()), dto.getSortType());
|