From e4d08920c3856bf281021735ade7f47f856684e2 Mon Sep 17 00:00:00 2001
From: bynt <13586541001@163.com>
Date: Wed, 29 Nov 2023 14:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/baiye/timed/DeliveryBalanceTask.java  | 70 ++++++++++---------
 1 file changed, 36 insertions(+), 34 deletions(-)

diff --git a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
index 8a3ceac1..7cf91caf 100644
--- a/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
+++ b/ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java
@@ -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