添加邮件

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketEmailsServiceImpl.java

@@ -173,15 +173,15 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
                 MarketEmailsEntity::getHasSuspend);
         List<MarketEmailsEntity> all = this.list(wrapper);
         // 按 recipient 聚合
-        Map<String, com.storlead.trade.vo.MarketEmailsOpenVO> aggMap = new HashMap<>();
+        Map<String, MarketEmailsOpenVO> aggMap = new HashMap<>();
         if (!CollectionUtils.isEmpty(all)) {
             for (MarketEmailsEntity e : all) {
                 String r = e.getRecipient();
                 if (r == null || r.isEmpty()) {
                     continue;
                 }
-                com.storlead.trade.vo.MarketEmailsOpenVO vo = aggMap.computeIfAbsent(r, k -> {
-                    com.storlead.trade.vo.MarketEmailsOpenVO v = new com.storlead.trade.vo.MarketEmailsOpenVO();
+                MarketEmailsOpenVO vo = aggMap.computeIfAbsent(r, k -> {
+                    MarketEmailsOpenVO v = new MarketEmailsOpenVO();
                     v.setRecipient(k);
                     v.setClickCount(0L);
                     return v;
@@ -651,8 +651,8 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         }
 
         // 批量收 ID，减少 N+1
-        java.util.Set<Long> customerIdSet = new java.util.HashSet<>();
-        java.util.Set<Long> sopDetailIdSet = new java.util.HashSet<>();
+        Set<Long> customerIdSet = new HashSet<>();
+        Set<Long> sopDetailIdSet = new HashSet<>();
         for (MarketEmailsEntity e : entityList) {
             if (e.getCustomerId() != null) customerIdSet.add(e.getCustomerId());
             if (e.getMarketingCampaignSopDetailId() != null) sopDetailIdSet.add(e.getMarketingCampaignSopDetailId());
@@ -660,7 +660,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
 
         Map<Long, CustomerEntity> customerMap = customerIdSet.isEmpty()
                 ? Collections.emptyMap()
-                : customerTradeService.listByIds(new java.util.ArrayList<>(customerIdSet)).stream()
+                : customerTradeService.listByIds(new ArrayList<>(customerIdSet)).stream()
                     .collect(Collectors.toMap(CustomerEntity::getId, c -> c, (a, c) -> a));
         Map<Long, MarketingCampaignSopDetailEntity> sopDetailMap = sopDetailIdSet.isEmpty()
                 ? Collections.emptyMap()

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/vo/MarketEmailsManagementVO.java

@@ -1,5 +1,6 @@
 package com.storlead.trade.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,6 +48,9 @@ public class MarketEmailsManagementVO implements Serializable {
     @ApiModelProperty(value = "阶段名（首次介绍 / 报价邮件 等，来自 marketing_campaign_sop_detail.name）")
     private String stageName;
 
+    @ApiModelProperty(value = "对应的邮件id")
+    private Long emailId;
+
     @ApiModelProperty(value = "预计发送时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date expectSendTime;

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/vo/MarketEmailsReplyVO.java

@@ -1,6 +1,7 @@
 package com.storlead.trade.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,6 +34,9 @@ public class MarketEmailsReplyVO implements Serializable {
     @ApiModelProperty(value = "客户id（同一 recipient 取最早回复那一条所属的 customerId）")
     private Long customerId;
 
+    @ApiModelProperty(value = "对应的邮件id")
+    private Long emailId;
+
     @ApiModelProperty(value = "客户名称")
     private String customerName;