|
|
@ -61,6 +61,7 @@ public class TbsActivitySlottingFeeController { |
|
|
|
public R<PageVo<TbsActivitySlottingFee>> getPage(TbsActivitySlottingFee param){ |
|
|
|
LambdaQueryWrapper<TbsActivitySlottingFee> lqw = new LambdaQueryWrapper<>(param); |
|
|
|
PageUtil.startPage(); |
|
|
|
lqw.eq(TbsActivitySlottingFee::getPassFlag,1); |
|
|
|
List<TbsActivitySlottingFee> list = tbsActivitySlottingFeeService.list(lqw); |
|
|
|
return R.byPageHelperList(list); |
|
|
|
} |
|
|
@ -83,22 +84,21 @@ public class TbsActivitySlottingFeeController { |
|
|
|
List<TbsActivityGoods> goodsList = activityGoodsService.list(qw); |
|
|
|
List<TbsActivityChannel> channelList = channelService.list(qw); |
|
|
|
List<TbsActivityChannelPoint> pointList = channelPointService.list(qw); |
|
|
|
List<Long> goodsIds = goodsList.stream().map(TbsActivityGoods::getTargetId).collect(Collectors.toList()); |
|
|
|
List<Long> channelIds = channelList.stream().map(TbsActivityChannel::getChannelId).collect(Collectors.toList()); |
|
|
|
List<Long> pointIds = pointList.stream().map(TbsActivityChannelPoint::getPointId).collect(Collectors.toList()); |
|
|
|
List<Long> goodsIds = goodsList.stream().map(TbsActivityGoods::getTargetId).distinct().collect(Collectors.toList()); |
|
|
|
List<Long> channelIds = channelList.stream().map(TbsActivityChannel::getChannelId).distinct().collect(Collectors.toList()); |
|
|
|
List<Long> pointIds = pointList.stream().map(TbsActivityChannelPoint::getPointId).distinct().collect(Collectors.toList()); |
|
|
|
LambdaQueryWrapper<TbsActivitySlottingFee> lqw = new LambdaQueryWrapper<>(); |
|
|
|
if (goodsIds.size() > 0) { |
|
|
|
lqw.in(TbsActivitySlottingFee::getTargetId, goodsIds); |
|
|
|
}else { |
|
|
|
//防止查其他数据
|
|
|
|
lqw.eq(TbsActivitySlottingFee::getId,"0"); |
|
|
|
} |
|
|
|
lqw.eq(TbsActivitySlottingFee::getTargetType, "spu"); |
|
|
|
} |
|
|
|
if (channelIds.size() > 0) { |
|
|
|
lqw.eq(TbsActivitySlottingFee::getChannelId,channelIds); |
|
|
|
}else if (pointIds.size()>0){ |
|
|
|
lqw.eq(TbsActivitySlottingFee::getPointId,pointIds); |
|
|
|
}else { |
|
|
|
lqw.in(TbsActivitySlottingFee::getChannelId, channelIds); |
|
|
|
} |
|
|
|
if (pointIds.size() > 0) { |
|
|
|
lqw.in(TbsActivitySlottingFee::getPointId, pointIds); |
|
|
|
} |
|
|
|
if(goodsIds.size()==0 && channelIds.size()==0 && pointIds.size()==0){ |
|
|
|
//防止查其他数据
|
|
|
|
lqw.eq(TbsActivitySlottingFee::getId,"0"); |
|
|
|
} |
|
|
|