java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/MarketingCampaignSopDetailController.java

@@ -376,6 +376,9 @@ public class MarketingCampaignSopDetailController {
         boolean isOk = marketingCampaignSopDetailService.updateById(entity);
         if (!isOk) {
             return Result.error("修改失败");
+        }
+        if (!ObjectUtils.isEmpty(dto.getEmailContent())){
+
         }
         return Result.result(entity);
     }

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

@@ -133,6 +133,10 @@ public class MarketEmailsServiceImpl extends MyBaseServiceImpl<MarketEmailsMappe
         if (!isOk) {
             return Result.error("修改失败");
         }
+        if(!ObjectUtils.isEmpty(entity.getContent())){
+            //写入邮件内容，替换客户名
+
+        }
         return Result.ok();
     }
 

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

@@ -139,7 +139,6 @@ public class MarketingCampaignServiceImpl
         List<Long> customerIdList = customerBaseEntityList.stream().map(CustomerBaseEntity::getCustomerId).collect(Collectors.toList());
         List<CustomerEntity> customerEntityList = customerTradeService.listByIds(customerIdList);
 
-
 //        List<SopDetailEntity> sopDetailList = Collections.emptyList();
 //        if (!CollectionUtils.isEmpty(relationList)) {
 //            List<Long> sopDetailIds = relationList.stream()

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

@@ -136,6 +136,10 @@ public class SopDetailServiceImpl
         if (!ok) {
             return Result.error("更新 SOP 明细失败");
         }
+        if (!ObjectUtils.isEmpty(dto.getEmailContent())){
+            //写入每个客户的邮件内容
+
+        }
         return Result.ok();
     }
 

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

@@ -156,6 +156,35 @@ public class SopServiceImpl extends ServiceImpl<SopMapper, SopEntity> implements
         return response;
     }
 
+//    @Override
+    public SopResponseDTO getSopDetailWithActivity(Long id) {
+        SopResponseDTO response = new SopResponseDTO();
+
+        // 1. 查询SOP主表
+        SopEntity sop = getById(id);
+        if (sop == null) {
+            throw new RuntimeException("SOP不存在，ID: " + id);
+        }
+        BeanUtils.copyProperties(sop, response);
+
+        // 2. 查询SOP明细
+        LambdaQueryWrapper<SopDetailEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SopDetailEntity::getSopId, id);
+        wrapper.orderByAsc(SopDetailEntity::getStep);
+        List<SopDetailEntity> details = sopDetailService.list(wrapper);
+
+        // 3. 转换明细
+        List<SopDetailResponseDTO> detailResponses = details.stream().map(detail -> {
+            SopDetailResponseDTO dto = new SopDetailResponseDTO();
+            BeanUtils.copyProperties(detail, dto);
+            return dto;
+        }).collect(Collectors.toList());
+
+        response.setDetails(detailResponses);
+
+        return response;
+    }
+
     @Override
     public IPage<SopResponseDTO> listSopPage(SopResponseDTO dto) {
         Integer pageIndex = dto.getPageIndex();