BY-Team
/
ad-platform
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改预测试发送任务

Browse Source
master
bynt 10 months ago
parent 7088de669f
commit e4d08920c3
1 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File

70
ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
Unescape Escape View File

@ -96,42 +96,44 @@ public class DeliveryBalanceTask {
&& Boolean.TRUE.equals(userInfo.getEnabled())
&& ObjectUtil.isNotNull(channelCustom)
&& Boolean.TRUE.equals(taskTagDto.getIsDmpDelivery())) {
Integer dmpLimitNum = channelCustom.getDmpLimitNum();
// 找出两天之内未兑换的数量
Integer number = deliveryRecordService.queryNumberByDateAndUser
(DateUtil.offsetDay(DateUtil.date(), DefaultNumberConstants.MINUS_TWO_NUMBER),
DefaultNumberConstants.ZERO_NUMBER, userId);
// 判断剩余数量
if (ObjectUtil.isNull(channelCustom.getSurplusNum()) || ObjectUtil.isNull(dmpLimitNum)
|| channelCustom.getSurplusNum() - (number != null ? number : DefaultNumberConstants.ZERO_NUMBER) >>
DefaultNumberConstants.ONE_NUMBER <= DefaultNumberConstants.TEN_NUMBER) {
continue;
}
lock.lock();
try {
// 截取数据
if (ObjectUtil.isNotNull(dmpLimitNum)
&& dmpLimitNum > DefaultNumberConstants.ZERO_NUMBER) {
DateTime now = DateUtil.date();
// 统计今天数量
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()) {
list = CollUtil.sub(list, DefaultNumberConstants.ZERO_NUMBER,
channelCustom.getSurplusNum());
downList.addAll(CollUtil.sub
(list, channelCustom.getSurplusNum(), list.size()));
if (taskTagDto.getIsForm() != null && taskTagDto.getIsForm() != DefaultNumberConstants.EIGHT_NUMBER) {
Integer dmpLimitNum = channelCustom.getDmpLimitNum();
// 找出两天之内未兑换的数量
Integer number = deliveryRecordService.queryNumberByDateAndUser
(DateUtil.offsetDay(DateUtil.date(), DefaultNumberConstants.MINUS_TWO_NUMBER),
DefaultNumberConstants.ZERO_NUMBER, userId);
// 判断剩余数量
if (ObjectUtil.isNull(channelCustom.getSurplusNum()) || ObjectUtil.isNull(dmpLimitNum)
|| channelCustom.getSurplusNum() - (number != null ? number : DefaultNumberConstants.ZERO_NUMBER) >>
DefaultNumberConstants.ONE_NUMBER <= DefaultNumberConstants.TEN_NUMBER) {
continue;
}
// 截取数据
if (ObjectUtil.isNotNull(dmpLimitNum)
&& dmpLimitNum > DefaultNumberConstants.ZERO_NUMBER) {
DateTime now = DateUtil.date();
// 统计今天数量
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()) {
list = CollUtil.sub(list, DefaultNumberConstants.ZERO_NUMBER,
channelCustom.getSurplusNum());
downList.addAll(CollUtil.sub
(list, channelCustom.getSurplusNum(), list.size()));
}
}
// 总量超过50

Write Preview
Loading…
Cancel
Save