增加日志

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

@@ -65,16 +65,16 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService {
         Double deliveryFee = payFatherTemplate.getDmpDeliveryFee();
         Double rollCallFee = payFatherTemplate.getRollCallFee();
         PayFatherTemplate updateTemplate = payFatherTemplateRepository.findById(payFatherTemplate.getId()).orElseGet(PayFatherTemplate::new);
-        if (status != null){
+        if (status != null) {
             updateTemplate.setStatus(status);
         }
-        if (StringUtils.isNotBlank(name)){
+        if (StringUtils.isNotBlank(name)) {
             updateTemplate.setName(name);
         }
-        if (doubleCallFee != null){
+        if (doubleCallFee != null) {
             updateTemplate.setDoubleCallFee(doubleCallFee);
         }
-        if (rollCallFee != null){
+        if (rollCallFee != null) {
             updateTemplate.setRollCallFee(rollCallFee);
         }
         if (ObjectUtil.isNotNull(deliveryFee)) {
@@ -87,16 +87,16 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public void del(Set<Long> ids) {
         List<Company> companies = companyRepository.findByTemplateIdIn(ids);
-        if (CollUtil.isNotEmpty(companies)){
+        if (CollUtil.isNotEmpty(companies)) {
             throw new BadRequestException("模板已绑定用户,请操作替换后然后删除");
         }
         List<PayFatherTemplate> payFatherTemplateList = payFatherTemplateRepository.findAllById(ids);
-        if (CollUtil.isNotEmpty(payFatherTemplateList)){
+        if (CollUtil.isNotEmpty(payFatherTemplateList)) {
             payFatherTemplateList.forEach(pt -> pt.setStatus(DefaultNumberConstants.ONE_NUMBER));
             payFatherTemplateRepository.saveAll(payFatherTemplateList);
         }
         Set<PayCombo> payComboSet = payComboRepository.findByFatherTemplateIdInAndStatus(ids, DefaultNumberConstants.ZERO_NUMBER);
-        if (CollUtil.isNotEmpty(payComboSet)){
+        if (CollUtil.isNotEmpty(payComboSet)) {
             payComboSet.forEach(pt -> pt.setStatus(DefaultNumberConstants.ONE_NUMBER));
             payComboRepository.saveAll(payComboSet);
         }
@@ -107,13 +107,13 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService {
         PageRequest pageRequest = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), Sort.by(Sort.Direction.DESC, "createTime"));
         payFatherTemplateQueryCriteria.setStatus(DefaultNumberConstants.ZERO_NUMBER);
         Page<PayFatherTemplate> all = payFatherTemplateRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, payFatherTemplateQueryCriteria, criteriaBuilder), pageRequest);
-        if (CollUtil.isNotEmpty(all)){
+        if (CollUtil.isNotEmpty(all)) {
             Set<Long> templateIds = all.stream().map(PayFatherTemplate::getId).collect(Collectors.toSet());
             Set<PayCombo> payCombos = payComboRepository.findByFatherTemplateIdInAndStatus(templateIds, DefaultNumberConstants.ZERO_NUMBER);
             Map<Long, List<PayCombo>> fatherGroupMap = payCombos.stream().collect(Collectors.groupingBy(PayCombo::getFatherTemplateId));
             for (PayFatherTemplate payFatherTemplate : all) {
                 Long id = payFatherTemplate.getId();
-                if (fatherGroupMap.containsKey(id)){
+                if (fatherGroupMap.containsKey(id)) {
                     payFatherTemplate.setPayComboList(fatherGroupMap.get(id));
                 }
             }
@@ -130,12 +130,12 @@ public class PayFatherTemplateServiceImpl implements PayFatherTemplateService {
     @Transactional(rollbackFor = Exception.class)
     public void replace(Long replaceId, Long templateId) {
         Set<PayCombo> payComboSet = payComboRepository.findByFatherTemplateId(templateId);
-        if (CollUtil.isNotEmpty(payComboSet)){
+        if (CollUtil.isNotEmpty(payComboSet)) {
             payComboSet.forEach(ps -> ps.setFatherTemplateId(replaceId));
             payComboRepository.saveAll(payComboSet);
         }
         List<Company> companyList = companyRepository.findByTemplateId(templateId);
-        if (CollUtil.isNotEmpty(companyList)){
+        if (CollUtil.isNotEmpty(companyList)) {
             companyList.forEach(ct -> ct.setTemplateId(replaceId));
             companyRepository.saveAll(companyList);
         }

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

@@ -57,7 +57,7 @@ public class DeliveryBalanceTask {
     private final PayFatherTemplateService payFatherTemplateService;
 
 
-    @Scheduled(cron = "0 0/30 * * * ? ")
+    @Scheduled(cron = "0 0/30 8-23 * * ? ")
     @Transactional(rollbackFor = Exception.class)
     public void cashResources() {
         // 查询所有未兑换的
@@ -113,7 +113,7 @@ public class DeliveryBalanceTask {
                                 // 发送邮件
                                 MailUtil.sendMail(deliveryProperties.getEmailAddress(),
                                         deliveryProperties.getEmailPassword(),
-                                                deliveryProperties.getToEmailAddress(), zipPath, taskImeiName);
+                                        deliveryProperties.getToEmailAddress(), zipPath, taskImeiName);
                                 // 保存批次号
                                 redisUtils.set(CacheKey.DMP_REQUEST_ID.concat(format), batch, DefaultNumberConstants.ONE_NUMBER, TimeUnit.DAYS);
                                 // 修改状态 修改余额

services/ad-platform-source/src/main/java/com/baiye/module/service/impl/ClueServiceImpl.java

@@ -23,7 +23,9 @@ import com.baiye.module.entity.*;
 import com.baiye.module.listener.dto.BaseExcelListenerDto;
 import com.baiye.module.request.ReqOceanEngineApi;
 import com.baiye.module.service.ClueService;
-import com.baiye.module.service.dto.*;
+import com.baiye.module.service.dto.ClueRecordCriteria;
+import com.baiye.module.service.dto.ClueRecordDto;
+import com.baiye.module.service.dto.ExcelClueDto;
 import com.baiye.module.service.mapstruct.ClueRecordMapper;
 import com.baiye.util.*;
 import lombok.RequiredArgsConstructor;
@@ -1040,6 +1042,7 @@ public class ClueServiceImpl implements ClueService {
                         clue.setCreateBy(userId);
                         clue.setCastInfo(tagList.get(i));
                         clue.setOrigin(DefaultNumberConstants.FIVE_NUMBER);
+                        clue.setIsEncryption(DefaultNumberConstants.ONE_NUMBER);
                         Clue save = clueRepository.save(clue);
                         ClueMiddle clueMiddle = new ClueMiddle();
                         clueMiddle.setClueId(save.getId());

services/ad-platform-source/src/main/java/com/baiye/task/MailSourceTask.java

@@ -3,15 +3,13 @@ package com.baiye.task;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.lang.Console;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.text.csv.CsvData;
 import cn.hutool.core.text.csv.CsvReader;
 import cn.hutool.core.text.csv.CsvUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baiye.config.properties.DeliveryProperties;
 import com.baiye.constant.DefaultNumberConstants;
 import com.baiye.exception.BadRequestException;
@@ -33,11 +31,9 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.mail.Flags;
 import javax.mail.Message;
 import javax.mail.internet.MimeMessage;
 import java.io.File;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -121,6 +117,7 @@ public class MailSourceTask {
                                 }
                             }
                             if (CollUtil.isNotEmpty(decryptList)) {
+                                log.info("=================== the decryptList as {} =====================", JSONUtil.toJsonStr(decryptList));
                                 // 将imei转为线索
                                 clueService.saveClue(tagList, decryptList, byTaskName.getTaskId(),
                                         byTaskName.getUserId(), DefaultNumberConstants.FOUR_NUMBER);
@@ -142,7 +139,7 @@ public class MailSourceTask {
                     }
                 }
             } catch (Exception e) {
-                log.error("=================== the receive mail error time as  {} ===========", DateUtil.date());
+                log.error("=================== the receive mail error time as  {} ===========", e.getMessage());
                 throw new BadRequestException("接收邮件失败");
             }
         }

services/ad-platform-source/src/main/java/com/baiye/task/OceanEngineSync.java

@@ -154,7 +154,7 @@ public class OceanEngineSync {
             clue.setWx(weixin);
             clue.setAddress(address);
             clue.setCastInfo(stringBuilder.toString());
-            clue.setIsEncryption(DefaultNumberConstants.ONE_NUMBER);
+            // clue.setIsEncryption(DefaultNumberConstants.ONE_NUMBER);
             Clue save = clueRepository.save(clue);
 
             ClueMiddle clueMiddle = new ClueMiddle();