|
|
|
@ -109,12 +109,16 @@ public class DeliveryBalanceTask {
|
|
|
|
|
&& dmpLimitNum > DefaultNumberConstants.ZERO_NUMBER) {
|
|
|
|
|
DateTime now = DateUtil.date();
|
|
|
|
|
// 统计今天数量
|
|
|
|
|
Integer count = taskImeiService.countByUserIdAndDate
|
|
|
|
|
(userId, DateUtil.beginOfDay(now), DateUtil.endOfDay(now), DefaultNumberConstants.ONE_NUMBER);
|
|
|
|
|
downList = CollUtil.sub(list, count >=
|
|
|
|
|
dmpLimitNum ? DefaultNumberConstants.ZERO_NUMBER : dmpLimitNum, list.size());
|
|
|
|
|
list = CollUtil.sub(list, DefaultNumberConstants.ZERO_NUMBER,
|
|
|
|
|
count >= dmpLimitNum ? DefaultNumberConstants.ZERO_NUMBER : dmpLimitNum);
|
|
|
|
|
Integer count = deliveryRecordService.countByUserIdAndDate(userId, DateUtil.beginOfDay(now), DateUtil.endOfDay(now));
|
|
|
|
|
int sum = count + list.size();
|
|
|
|
|
// 下载统计
|
|
|
|
|
downList = CollUtil.sub(list, sum >= dmpLimitNum
|
|
|
|
|
? DefaultNumberConstants.ZERO_NUMBER : list.size(), dmpLimitNum > sum
|
|
|
|
|
? list.size() : sum - dmpLimitNum);
|
|
|
|
|
// 发送统计
|
|
|
|
|
list = CollUtil.sub(list, sum >= dmpLimitNum
|
|
|
|
|
? Math.min(sum - dmpLimitNum, list.size())
|
|
|
|
|
: DefaultNumberConstants.ZERO_NUMBER, list.size());
|
|
|
|
|
}
|
|
|
|
|
// 最大数量不能大于剩余数量
|
|
|
|
|
if (list.size() >= channelCustom.getSurplusNum()) {
|
|
|
|
|