Merge remote-tracking branch 'origin/master'

ad-platform-common/ad-platform-common-core/src/main/java/com/baiye/constant/DefaultNumberConstants.java

@@ -144,7 +144,7 @@ public class DefaultNumberConstants {
     /**
      * 100
      */
-    public static final double ONE_HUNDRED = 100;
+    public static final int ONE_HUNDRED = 100;
 
     /**
      * 200

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

@@ -79,4 +79,17 @@ public interface TaskImeiRepository extends JpaRepository<TaskImei, Long>, JpaSp
     @Modifying
     @Query(value = "delete from tb_task_imei where task_id in ?1", nativeQuery = true)
     void deleteByTaskIds(Set<Long> taskIds);
+
+
+    /**
+     * 时间修改状态
+     *
+     * @param status
+     * @param number
+     * @param dateTime
+     * @return
+     */
+    @Modifying
+    @Query(value = "update TaskImei i set i.status = ?1 where i.status = ?2  and i.createTime < ?3 ")
+    int updateImeiByDate(Integer status, Integer number, DateTime dateTime);
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/TaskImeiService.java

@@ -1,5 +1,6 @@
 package com.baiye.modules.platform.service;
 
+import cn.hutool.core.date.DateTime;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.platform.domain.TaskImei;
 import com.baiye.modules.platform.service.dto.PlatformTransmitDTO;
@@ -76,4 +77,14 @@ public interface TaskImeiService {
      * @return
      */
     CommonResponse<Object> processingData(TaskImeiDTO taskImeiDTO);
+
+    /**
+     * 根据时间修改状态
+     *
+     * @param status
+     * @param number
+     * @param dateTime
+     * @return
+     */
+    Boolean updateImeiByDate(Integer status, Integer number, DateTime dateTime);
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/CompanyServiceImpl.java

@@ -77,6 +77,7 @@ public class CompanyServiceImpl implements CompanyService {
         byUserId.setApplicationTime(DateUtil.date());
         byUserId.setCompanyCode(byUserId.getCompanyName().trim());
         byUserId.setSonUserNum(100);
+        byUserId.setDmpLimitNum(DefaultNumberConstants.ONE_HUNDRED);
         byUserId.setIsActivation(DefaultNumberConstants.ZERO_NUMBER);
         userRepository.updateStatusById(Boolean.FALSE, SecurityUtils.getCurrentUserId());
         return companyMapper.toDto(companyRepository.save(byUserId));

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/TaskImeiServiceImpl.java

@@ -1,6 +1,7 @@
 package com.baiye.modules.platform.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.ObjectUtil;
@@ -29,7 +30,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -163,6 +163,13 @@ public class TaskImeiServiceImpl implements TaskImeiService {
         return CommonResponse.createBySuccess(DefaultNumberConstants.TWO_HUNDRED);
     }
 
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateImeiByDate(Integer status, Integer number, DateTime dateTime) {
+        return taskImeiRepository.updateImeiByDate(status, number, dateTime) > DefaultNumberConstants.ZERO_NUMBER;
+    }
+
 }
 
 

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

@@ -86,8 +86,8 @@ public class DeliveryBalanceTask {
                         && ObjectUtil.isNotNull(companyByUserId.getDmpDeliveryFee())) {
                     Integer dmpLimitNum = companyByUserId.getDmpLimitNum();
                     // 判断余额
-                    if (ObjectUtil.isNull(companyByUserId.getUserBalance())
-                            || companyByUserId.getUserBalance() <= DefaultNumberConstants.ZERO_NUMBER) {
+                    if (ObjectUtil.isNull(companyByUserId.getUserBalance()) || ObjectUtil.isNull(dmpLimitNum)
+                            || companyByUserId.getUserBalance() < DefaultNumberConstants.TWO_HUNDRED) {
                         continue;
                     }
                     // 截取数据

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

@@ -0,0 +1,39 @@
+package com.baiye.timed;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baiye.constant.DefaultNumberConstants;
+import com.baiye.modules.platform.service.TaskImeiService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Enzo
+ * @date : 2023/3/13
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class UpdateImeiTask {
+
+
+    private final TaskImeiService taskImeiService;
+
+
+    /**
+     * 修改两天前的数据
+     */
+    @Scheduled(cron = "0 30 1 * * ?")
+    public void updateImeiByDate() {
+
+        log.info("================= the update imei time as {} =================", DateUtil.date());
+        DateTime dateTime = DateUtil.offsetDay(DateUtil.date(), -DefaultNumberConstants.TWO_NUMBER);
+        Boolean result = taskImeiService.updateImeiByDate(DefaultNumberConstants.ONE_NUMBER, DefaultNumberConstants.ZERO_NUMBER, dateTime);
+        log.info("================= the update imei time as {} the result as {} =================", DateUtil.date(), result);
+    }
+
+
+
+}