修改统计

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

@@ -62,6 +62,9 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
 
     @Resource
     private CustomerTradeService customerTradeService;
+    @Resource
+    private CustomerCompanyTradeService customerCompanyTradeService;
+
     @Resource
     @Lazy
     private MarketingCampaignSopDetailService marketingCampaignSopDetailEntityService;
@@ -79,6 +82,8 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
 
     @Resource
     private MktMailRemoteClient mktMailRemoteClient;
+    @Resource
+    private LiaisonTradeService liaisonTradeService;
 
 
     @Override
@@ -1009,6 +1014,24 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
                     marketEmail.setProtectReason(marketOtherEmail.getProtectReason());
                     marketEmail.setProtectTime(marketOtherEmail.getProtectTime());
                 }
+
+                //通过客户id写入企业关联邮箱
+                String email = "";
+                CustomerCompanyEntity customerCompany = customerCompanyTradeService.getOne(new LambdaQueryWrapper<CustomerCompanyEntity>()
+                        .eq(CustomerCompanyEntity::getCustomerId, marketEmail.getCustomerId())
+                        .eq(CustomerCompanyEntity::getIsDelete, CommonConstant.DEL_FLAG_0)
+                        .last("limit 1"));
+                if (!ObjectUtils.isEmpty(customerCompany)){
+                    email = customerCompany.getEmail();
+                    if (ObjectUtils.isEmpty(email)){
+                        LiaisonEntity liaison = liaisonTradeService.getOne(new LambdaQueryWrapper<LiaisonEntity>()
+                                .eq(LiaisonEntity::getCustomerId, marketEmail.getCustomerId())
+                                .eq(LiaisonEntity::getIsDelete, CommonConstant.DEL_FLAG_0)
+                                .eq(LiaisonEntity::getHasPrimaryLialison,1)
+                                .last("limit 1"));
+                        email = liaison.getEmail();
+                    }
+                }
             }
             this.saveBatch(marketEmailList);
 

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

@@ -149,9 +149,9 @@ public class MarketingCampaignSopDetailServiceImpl
                 marketEmailsEntity.setSubject(emailSubjectNew);
 
             }
-            if (!ObjectUtils.isEmpty(marketEmailsEntity.getCustomerId()) && !ObjectUtils.isEmpty(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany()) && !ObjectUtils.isEmpty(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany().getEmail())){
-                marketEmailsEntity.setRecipient(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany().getEmail());
-            }
+//            if (!ObjectUtils.isEmpty(marketEmailsEntity.getCustomerId()) && !ObjectUtils.isEmpty(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany()) && !ObjectUtils.isEmpty(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany().getEmail())){
+//                marketEmailsEntity.setRecipient(customerEntityMap.get(marketEmailsEntity.getCustomerId()).getCustomerCompany().getEmail());
+//            }
 
         }
         boolean isOk = marketEmailsService.updateBatchById(marketEmailsEntityList);