修改预测试发送任务

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/timed/DeliveryBalanceTask.java

@@ -96,6 +96,9 @@ public class DeliveryBalanceTask {
                         && Boolean.TRUE.equals(userInfo.getEnabled())
                                 && ObjectUtil.isNotNull(channelCustom)
                                         && Boolean.TRUE.equals(taskTagDto.getIsDmpDelivery())) {
+                    lock.lock();
+                    try {
+                        if (taskTagDto.getIsForm() != null && taskTagDto.getIsForm() != DefaultNumberConstants.EIGHT_NUMBER) {
                             Integer dmpLimitNum = channelCustom.getDmpLimitNum();
                             // 找出两天之内未兑换的数量
                             Integer number = deliveryRecordService.queryNumberByDateAndUser
@@ -107,8 +110,6 @@ public class DeliveryBalanceTask {
                                             DefaultNumberConstants.ONE_NUMBER <= DefaultNumberConstants.TEN_NUMBER) {
                                 continue;
                             }
-                    lock.lock();
-                    try {
                             // 截取数据
                             if (ObjectUtil.isNotNull(dmpLimitNum)
                                     && dmpLimitNum > DefaultNumberConstants.ZERO_NUMBER) {
@@ -133,6 +134,7 @@ public class DeliveryBalanceTask {
                                 downList.addAll(CollUtil.sub
                                         (list, channelCustom.getSurplusNum(), list.size()));
                             }
+                        }
 
                         // 总量超过50
                         if (CollUtil.isNotEmpty(list)) {