Merge remote-tracking branch 'origin/master'

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

@@ -20,10 +20,7 @@ import com.storlead.trade.dto.MarketEmailsDTO;
 import com.storlead.trade.entity.*;
 import com.storlead.trade.mapper.MarketEmailsMapper;
 import com.storlead.trade.service.*;
-import com.storlead.trade.vo.MarketEmailsCustomerVO;
-import com.storlead.trade.vo.MarketEmailsManagementVO;
-import com.storlead.trade.vo.MarketEmailsOpenVO;
-import com.storlead.trade.vo.ScheduleStageVO;
+import com.storlead.trade.vo.*;
 import org.slf4j.Logger;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -169,6 +166,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         wrapper.ne(MarketEmailsEntity::getRecipient, "");
         // 只查需要的列，减少数据传输
         wrapper.select(MarketEmailsEntity::getRecipient,
+                MarketEmailsEntity::getId,
                 MarketEmailsEntity::getCustomerId,
                 MarketEmailsEntity::getFirstOpenTime,
                 MarketEmailsEntity::getHasProtect,
@@ -379,6 +377,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         wrapper.isNotNull(MarketEmailsEntity::getRecipient);
         wrapper.ne(MarketEmailsEntity::getRecipient, "");
         wrapper.select(MarketEmailsEntity::getRecipient,
+                MarketEmailsEntity::getId,
                 MarketEmailsEntity::getCustomerId,
                 MarketEmailsEntity::getHasProtect,
                 MarketEmailsEntity::getHasSuspend,
@@ -389,15 +388,15 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         List<MarketEmailsEntity> all = this.list(wrapper);
 
         // 按 recipient 聚合
-        Map<String, com.storlead.trade.vo.MarketEmailsReplyVO> aggMap = new HashMap<>();
+        Map<String, MarketEmailsReplyVO> 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.MarketEmailsReplyVO vo = aggMap.computeIfAbsent(r, k -> {
-                    com.storlead.trade.vo.MarketEmailsReplyVO v = new com.storlead.trade.vo.MarketEmailsReplyVO();
+                MarketEmailsReplyVO vo = aggMap.computeIfAbsent(r, k -> {
+                    MarketEmailsReplyVO v = new MarketEmailsReplyVO();
                     v.setRecipient(k);
                     v.setReplyCount(0L);
                     return v;
@@ -525,13 +524,13 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         List<MarketEmailsEntity> all = this.list(wrapper);
 
         // 按 recipient 聚合（同一客户多个保护/暂停记录合并为一张卡片）
-        Map<String, com.storlead.trade.vo.MarketEmailsProtectVO> aggMap = new HashMap<>();
+        Map<String, MarketEmailsProtectVO> 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.MarketEmailsProtectVO vo = aggMap.computeIfAbsent(r, k -> {
-                    com.storlead.trade.vo.MarketEmailsProtectVO v = new com.storlead.trade.vo.MarketEmailsProtectVO();
+                MarketEmailsProtectVO vo = aggMap.computeIfAbsent(r, k -> {
+                    MarketEmailsProtectVO v = new MarketEmailsProtectVO();
                     v.setRecipient(k);
                     v.setHasProtect(0);
                     v.setHasSuspend(0);

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

@@ -22,6 +22,9 @@ public class MarketEmailsOpenVO implements Serializable {
     @ApiModelProperty(value = "发件人邮箱（客户邮箱）")
     private String recipient;
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     @ApiModelProperty(value = "客户id（同一 recipient 取最早打开那一条所属的 customerId）")
     private Long customerId;
 

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

@@ -27,6 +27,9 @@ public class MarketEmailsReplyVO implements Serializable {
     @ApiModelProperty(value = "发件人邮箱（客户邮箱）")
     private String recipient;
 
+    @ApiModelProperty(value = "id")
+    private Long id;
+
     @ApiModelProperty(value = "客户id（同一 recipient 取最早回复那一条所属的 customerId）")
     private Long customerId;