优化询盘判断代码

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/enquiry/service/impl/AdwebEnquiryServiceImpl.java

@@ -2068,14 +2068,9 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     adwebRedisUtil.set(TenMinKey, tenMin, 10 * 60);
 
     if (tenMin > emailTenMinNum) {
-      adwebEnquiry.setWasteEnquiry(1);
-      adwebEnquiry.setUserEffective(0);
-      adwebEnquiry.setWasteEnquiryType("email");
-      adwebEnquiry.setEffectiveReason("系统操作-通过十分钟内重复邮箱检测到垃圾询盘-" + adwebEnquiry.getEmail());
-      log.info(
-          "询盘id是:{}, 站点code是:{}, 通过——十分钟内—重复邮箱—检测到垃圾询盘",
-          adwebEnquiry.getId(),
-          adwebEnquiry.getSiteCode());
+      String reason = String.format("系统操作-通过十分钟内重复邮箱检测到垃圾询盘-" + adwebEnquiry.getEmail());
+      markAsWasteEnquiry(adwebEnquiry, reason, "email");
+      logInfo(adwebEnquiry, reason);
       if (enquirySiteBlackEmailService.count(
               new LambdaQueryWrapper<AdwebSiteBlackEmail>()
                   .eq(AdwebSiteBlackEmail::getEmail, adwebEnquiry.getEmail())
@@ -2085,11 +2080,8 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
           == 0) {
         siteBlackEmailList.add(adwebEnquiry.getEmail());
         blackEmailList.add(adwebEnquiry.getEmail());
-        log.info(
-            "询盘id是:{}, 站点code是:{}, 检测十分钟内重复，已标记邮箱, 邮箱是:{}",
-            adwebEnquiry.getId(),
-            adwebEnquiry.getSiteCode(),
-            adwebEnquiry.getEmail());
+
+        logInfo(adwebEnquiry, "检测十分钟内重复，已标记邮箱, 邮箱是:" + adwebEnquiry.getEmail());
       }
       // 存储到数据库中
       EffectiveEnquiryParamDto effectiveEnquiryParamDto = new EffectiveEnquiryParamDto();
@@ -2113,18 +2105,15 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
     adwebRedisUtil.set(oneDayKey, oneDay, 24 * 60 * 60);
 
     if (oneDay > emailOneDayNum) {
-      adwebEnquiry.setWasteEnquiry(1);
-      adwebEnquiry.setUserEffective(0);
-      adwebEnquiry.setWasteEnquiryType("email");
-      adwebEnquiry.setEffectiveReason("系统操作-通过一天内重复邮箱检测到垃圾询盘-" + adwebEnquiry.getEmail());
-      log.info(
-          "询盘id是:{}, 站点code是:{}, 通过——一天内—重复邮箱—检测到垃圾询盘",
-          adwebEnquiry.getId(),
-          adwebEnquiry.getSiteCode());
+      String reason = String.format("系统操作-通过一天内重复邮箱检测到垃圾询盘-" + adwebEnquiry.getEmail());
+      markAsWasteEnquiry(adwebEnquiry, reason, "email");
+      logInfo(adwebEnquiry, reason);
+
       log.info(
           "'--------dealShortSameEmail -----'===>adwebEnquiry.getEmail():{}",
           adwebEnquiry.getEmail());
       log.info("'--------dealShortSameEmail -----'===>adwebSite.getId():{}", adwebSite.getId());
+
       if (enquirySiteBlackEmailService.count(
               new LambdaQueryWrapper<AdwebSiteBlackEmail>()
                   .eq(AdwebSiteBlackEmail::getEmail, adwebEnquiry.getEmail())
@@ -2134,11 +2123,8 @@ public class AdwebEnquiryServiceImpl extends ServiceImpl<AdwebEnquiryMapper, Adw
           == 0) {
         siteBlackEmailList.add(adwebEnquiry.getEmail());
         blackEmailList.add(adwebEnquiry.getEmail());
-        log.info(
-            "询盘id是:{}, 站点code是:{}, 检测十分钟内重复，已标记邮箱, 邮箱是:{}",
-            adwebEnquiry.getId(),
-            adwebEnquiry.getSiteCode(),
-            adwebEnquiry.getEmail());
+
+        logInfo(adwebEnquiry, "检测一天内内重复，已标记邮箱, 邮箱是:" + adwebEnquiry.getEmail());
       }
       // 存储到数据库中
       EffectiveEnquiryParamDto effectiveEnquiryParamDto = new EffectiveEnquiryParamDto();