Merge remote-tracking branch 'origin/master'

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/repository/TaskImeiRepository.java

@@ -68,7 +68,7 @@ public interface TaskImeiRepository extends JpaRepository<TaskImei, Long>, JpaSp
      * @return
      */
     @Query(value = "select count(1) from tb_task_imei where" +
-            " to_days(create_time) = to_days(now()) and  user_id = ?1 and status = ?2", nativeQuery = true)
+            " to_days(create_time) = to_days(now()) and  task_id = ?1 and status = ?2", nativeQuery = true)
     Integer countByUserId(Long userId, Integer num);
 
     /**

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

@@ -88,7 +88,7 @@ public class DeliveryBalanceTask {
                     if (ObjectUtil.isNotNull(dmpLimitNum)
                             && dmpLimitNum > DefaultNumberConstants.ZERO_NUMBER) {
                         // 统计今天数量
-                        Integer count = taskImeiService.countByUserIdAndDate(taskId, DefaultNumberConstants.FOUR_NUMBER);
+                        Integer count = taskImeiService.countByUserIdAndDate(taskId, DefaultNumberConstants.ONE_NUMBER);
                         downList = CollUtil.sub(list, count >=
                                 dmpLimitNum ? DefaultNumberConstants.ZERO_NUMBER : dmpLimitNum, list.size());
                         list = CollUtil.sub(list, DefaultNumberConstants.ZERO_NUMBER,