Merge remote-tracking branch 'origin/master'

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

@@ -165,12 +165,12 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         wrapper.isNotNull(MarketEmailsEntity::getRecipient);
         wrapper.ne(MarketEmailsEntity::getRecipient, "");
         // 只查需要的列，减少数据传输
-        wrapper.select(MarketEmailsEntity::getRecipient,
-                MarketEmailsEntity::getId,
-                MarketEmailsEntity::getCustomerId,
-                MarketEmailsEntity::getFirstOpenTime,
-                MarketEmailsEntity::getHasProtect,
-                MarketEmailsEntity::getHasSuspend);
+//        wrapper.select(MarketEmailsEntity::getRecipient,
+//                MarketEmailsEntity::getId,
+//                MarketEmailsEntity::getCustomerId,
+//                MarketEmailsEntity::getFirstOpenTime,
+//                MarketEmailsEntity::getHasProtect,
+//                MarketEmailsEntity::getHasSuspend);
         List<MarketEmailsEntity> all = this.list(wrapper);
         // 按 recipient 聚合
         Map<String, MarketEmailsOpenVO> aggMap = new HashMap<>();
@@ -184,6 +184,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
                     MarketEmailsOpenVO v = new MarketEmailsOpenVO();
                     v.setRecipient(k);
                     v.setClickCount(0L);
+                    v.setId(e.getId());
                     return v;
                 });
                 vo.setClickCount(vo.getClickCount() + 1);
@@ -192,6 +193,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
                     if (vo.getFirstOpenTime() == null || e.getFirstOpenTime().before(vo.getFirstOpenTime())) {
                         vo.setFirstOpenTime(e.getFirstOpenTime());
                         vo.setCustomerId(e.getCustomerId());
+                        vo.setId(e.getId());
                     }
                 }
                 // MAX(has_protect) / MAX(has_suspend) 语义
@@ -204,7 +206,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
             }
         }
         // 按首次打开时间倒序
-        List<com.storlead.trade.vo.MarketEmailsOpenVO> sorted = new java.util.ArrayList<>(aggMap.values());
+        List<MarketEmailsOpenVO> sorted = new ArrayList<>(aggMap.values());
         sorted.sort((a, b) -> {
             if (a.getFirstOpenTime() == null && b.getFirstOpenTime() == null) return 0;
             if (a.getFirstOpenTime() == null) return 1;
@@ -217,24 +219,24 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         long total = sorted.size();
         long from = Math.min((pageIndex - 1) * pageSize, total);
         long to = Math.min(from + pageSize, total);
-        List<com.storlead.trade.vo.MarketEmailsOpenVO> pageList = sorted.subList((int) from, (int) to);
-        com.baomidou.mybatisplus.core.metadata.IPage<com.storlead.trade.vo.MarketEmailsOpenVO> page =
-                new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(pageIndex, pageSize, total);
+        List<MarketEmailsOpenVO> pageList = sorted.subList((int) from, (int) to);
+        IPage<MarketEmailsOpenVO> page =
+                new Page<>(pageIndex, pageSize, total);
         page.setRecords(pageList);
         // 回填客户名称（批量查 customer 表）
         if (pageList != null && !pageList.isEmpty()) {
-            java.util.Set<Long> customerIdSet = new java.util.LinkedHashSet<>();
-            for (com.storlead.trade.vo.MarketEmailsOpenVO v : pageList) {
+            Set<Long> customerIdSet = new LinkedHashSet<>();
+            for (MarketEmailsOpenVO v : pageList) {
                 if (v.getCustomerId() != null) {
                     customerIdSet.add(v.getCustomerId());
                 }
             }
             if (!customerIdSet.isEmpty()) {
                 try {
-                    java.util.List<CustomerEntity> customers =
-                            customerTradeService.listByIds(new java.util.ArrayList<>(customerIdSet));
+                    List<CustomerEntity> customers =
+                            customerTradeService.listByIds(new ArrayList<>(customerIdSet));
                     if (!CollectionUtils.isEmpty(customers)) {
-                        java.util.Map<Long, String> idToName = new java.util.HashMap<>(customers.size());
+                        Map<Long, String> idToName = new HashMap<>(customers.size());
                         for (CustomerEntity c : customers) {
                             if (c.getId() != null) {
                                 idToName.put(c.getId(), c.getCustomerName());
@@ -376,15 +378,6 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         wrapper.eq(MarketEmailsEntity::getMarketingCampaignId, marketingCampaignId);
         wrapper.isNotNull(MarketEmailsEntity::getRecipient);
         wrapper.ne(MarketEmailsEntity::getRecipient, "");
-        wrapper.select(MarketEmailsEntity::getRecipient,
-                MarketEmailsEntity::getId,
-                MarketEmailsEntity::getCustomerId,
-                MarketEmailsEntity::getHasProtect,
-                MarketEmailsEntity::getHasSuspend,
-                MarketEmailsEntity::getFirstReplyTime,
-                MarketEmailsEntity::getFirstReplyEmailId,
-                MarketEmailsEntity::getFirstReplyTheme,
-                MarketEmailsEntity::getCreateTime);
         List<MarketEmailsEntity> all = this.list(wrapper);
 
         // 按 recipient 聚合
@@ -445,9 +438,9 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
             if (!customerIdSet.isEmpty()) {
                 try {
                     // 回填客户名
-                    java.util.List<CustomerEntity> customers =
-                            customerTradeService.listByIds(new java.util.ArrayList<>(customerIdSet));
-                    java.util.Map<Long, CustomerEntity> customerMap = new java.util.HashMap<>();
+                    List<CustomerEntity> customers =
+                            customerTradeService.listByIds(new ArrayList<>(customerIdSet));
+                    Map<Long, CustomerEntity> customerMap = new HashMap<>();
                     if (!CollectionUtils.isEmpty(customers)) {
                         for (CustomerEntity c : customers) {
                             if (c.getId() != null) customerMap.put(c.getId(), c);
@@ -455,13 +448,13 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
                     }
                     // 回填客户等级 / 核心标签（从 CustomerAnalysisResultEntity）
                     // 一个 customer 可能有多个分析结果，取最新一条（id 最大）
-                    java.util.List<CustomerAnalysisResultEntity> analysisList =
+                    List<CustomerAnalysisResultEntity> analysisList =
                             customerAnalysisResultEntityService.list(
-                                    new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<CustomerAnalysisResultEntity>()
+                                    new LambdaQueryWrapper<CustomerAnalysisResultEntity>()
                                             .in(CustomerAnalysisResultEntity::getCustomerId, customerIdSet)
                                             .eq(CustomerAnalysisResultEntity::getIsDelete, CommonConstant.DEL_FLAG_0)
                                             .orderByDesc(CustomerAnalysisResultEntity::getId));
-                    java.util.Map<Long, CustomerAnalysisResultEntity> analysisMap = new java.util.HashMap<>();
+                    Map<Long, CustomerAnalysisResultEntity> analysisMap = new HashMap<>();
                     if (!CollectionUtils.isEmpty(analysisList)) {
                         for (CustomerAnalysisResultEntity a : analysisList) {
                             if (a.getCustomerId() != null && !analysisMap.containsKey(a.getCustomerId())) {
@@ -469,7 +462,7 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
                             }
                         }
                     }
-                    for (com.storlead.trade.vo.MarketEmailsReplyVO v : voList) {
+                    for (MarketEmailsReplyVO v : voList) {
                         CustomerEntity c = customerMap.get(v.getCustomerId());
                         if (c != null) {
                             v.setCustomerName(c.getCustomerName());