修改项目结构

java/storlead-api/src/main/java/com/storlead/api/StorleadTradeApplication.java

@@ -15,7 +15,7 @@ import java.net.InetAddress;
 @MapperScan({
         "com.storlead.account.tenant.mapper",
         "com.storlead.account.system.mapper",
-        "com.storlead.crm.customer.mapper",
+        "com.storlead.trade.customer.mapper",
         "com.storlead.user.mapper",
         "com.storlead.sms.mapper",
         "com.storlead.system.mapper",

java/storlead-sasa/storlead-trade/pom.xml

@@ -5,19 +5,73 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.storlead.boot</groupId>
-        <artifactId>storlead-saas-platform</artifactId>
+        <artifactId>storlead-sasa</artifactId>
         <version>1.0</version>
-        <relativePath>../../../pom.xml</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>storlead-trade</artifactId>
-    <packaging>pom</packaging>
-    <name>storlead-trade</name>
-    <description>客户经营域聚合模块；具体业务在下方子模块中实现。</description>
+    <packaging>jar</packaging>
+    <name>${project.artifactId}</name>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-common</artifactId>
+        </dependency>
+        <!-- 与 storlead-marketing 等一致：聚合 Web + storlead-mybatis（MySQL / MyBatis-Plus / Druid）+ storlead-redis + storlead-core -->
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-web</artifactId>
+        </dependency>
+        <!-- 定时任务大量使用 org.quartz（原 pom 未引入，单独编译会缺类） -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+        </dependency>
+        <!-- Controller 中 com.storlead.user.* -->
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-user-spi</artifactId>
+        </dependency>
+        <!-- Controller 中 com.storlead.system.* -->
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-system-spi</artifactId>
+        </dependency>
+        <!-- message 相关 Controller / TestApiController -->
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-message-biz</artifactId>
+        </dependency>
+        <!-- ES 客户相似度：编译期 spi+core；运行时 biz 提供实现（未启用 ES 时为 Noop） -->
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-es-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-es-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-es-biz</artifactId>
+        </dependency>
+        <!-- 邮件域：api 含 biz/spi/core；CRM 邮件 Controller 仍在本模块 -->
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mail-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mail-spi</artifactId>
+        </dependency>
+    </dependencies>
 
-    <modules>
-        <module>storlead-customer</module>
-        <module>storlead-marketing</module>
-        <module>storlead-acquisition</module>
-    </modules>
 </project>

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/common/Page.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/common/Page.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.common;
+package com.storlead.trade.common;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.metadata.IPage;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/controller/CustomerAiAnalysisController.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/CustomerAiAnalysisController.java

@@ -1,8 +1,8 @@
-package com.storlead.crm.customer.controller;
+package com.storlead.trade.controller;
 
-import com.storlead.crm.customer.dto.CustomerSingleAnalysisRequestDTO;
-import com.storlead.crm.customer.entity.CustomerAnalysisResultEntity;
-import com.storlead.crm.customer.service.CustomerAiAnalysisService;
+import com.storlead.trade.customer.dto.CustomerSingleAnalysisRequestDTO;
+import com.storlead.trade.customer.entity.CustomerAnalysisResultEntity;
+import com.storlead.trade.customer.service.CustomerAiAnalysisService;
 import com.storlead.framework.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/controller/MarketingController.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/MarketingController.java

@@ -1,7 +1,7 @@
-package com.storlead.crm.marketing.controller;
+package com.storlead.trade.controller;
 
-import com.storlead.crm.marketing.dto.MarketingCampaignDTO;
-import com.storlead.crm.marketing.service.MarketingCampaignEntityService;
+import com.storlead.trade.dto.MarketingCampaignDTO;
+import com.storlead.trade.service.MarketingCampaignEntityService;
 import com.storlead.framework.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/controller/SopController.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/SopController.java

@@ -1,20 +1,15 @@
-package com.storlead.crm.marketing.controller;
+package com.storlead.trade.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.storlead.crm.marketing.dto.SopCreateDTO;
-import com.storlead.crm.marketing.dto.SopDetailCreateDTO;
-import com.storlead.crm.marketing.dto.SopDetailUpdateDTO;
-import com.storlead.crm.marketing.dto.SopResponseDTO;
-import com.storlead.crm.marketing.dto.SopUpdateDTO;
-import com.storlead.crm.marketing.service.SopService;
+import com.storlead.trade.dto.SopCreateDTO;
+import com.storlead.trade.dto.SopResponseDTO;
+import com.storlead.trade.dto.SopUpdateDTO;
+import com.storlead.trade.service.SopService;
 import com.storlead.framework.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/dto/CustomerSingleAnalysisRequestDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/CustomerSingleAnalysisRequestDTO.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.customer.dto;
+package com.storlead.trade.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/dto/MarketingCampaignDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/MarketingCampaignDTO.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.dto;
+package com.storlead.trade.dto;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.storlead.crm.marketing.entity.MarketingCampaignEntity;
-import com.storlead.framework.mybatis.entity.SysBaseField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/dto/SopCreateDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/SopCreateDTO.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.dto;
+package com.storlead.trade.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/dto/SopDetailCreateDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/SopDetailCreateDTO.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.dto;
+package com.storlead.trade.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/dto/SopDetailResponseDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/SopDetailResponseDTO.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.dto;
+package com.storlead.trade.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/dto/SopDetailUpdateDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/SopDetailUpdateDTO.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.dto;
+package com.storlead.trade.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/dto/SopResponseDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/SopResponseDTO.java

@@ -1,7 +1,6 @@
-package com.storlead.crm.marketing.dto;
+package com.storlead.trade.dto;
 
 import com.storlead.framework.common.dto.page.PageDTO;
-import com.storlead.framework.mybatis.page.Page;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/dto/SopUpdateDTO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/dto/SopUpdateDTO.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.dto;
+package com.storlead.trade.dto;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/entity/CustomerAnalysisResultEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/CustomerAnalysisResultEntity.java

@@ -1,9 +1,8 @@
-package com.storlead.crm.customer.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.storlead.framework.mybatis.entity.SysBaseField;
 import com.storlead.framework.mybatis.entity.TenantBaseField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/entity/CustomerBaseEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/CustomerBaseEntity.java

@@ -1,11 +1,10 @@
-package com.storlead.crm.marketing.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.storlead.framework.mybatis.entity.SysBaseField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.time.LocalDateTime;
 
 @Data
 @TableName("customer_base")

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/entity/CustomerCompanyEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/CustomerCompanyEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.customer.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/entity/CustomerEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/CustomerEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.customer.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/entity/LiaisonEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/LiaisonEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.customer.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/entity/MarketingCampaignEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/MarketingCampaignEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.entity;
+package com.storlead.trade.entity;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -12,7 +12,6 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 @Data
 @TableName("marketing_campaign")

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/entity/SopDetailEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/SopDetailEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.storlead.framework.mybatis.entity.SysBaseField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.time.LocalDateTime;
 
 @Data
 @TableName("sop_detail")

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/entity/SopEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/SopEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.storlead.framework.mybatis.entity.SysBaseField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.time.LocalDateTime;
 
 @Data
 @TableName("sop")

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/entity/TagEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/TagEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/entity/TemplateEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/TemplateEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.storlead.framework.mybatis.entity.SysBaseField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.time.LocalDateTime;
 
 @Data
 @TableName("template")

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/entity/TemplateTagEntity.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/entity/TemplateTagEntity.java

@@ -1,4 +1,4 @@
-package com.storlead.crm.marketing.entity;
+package com.storlead.trade.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/mapper/CustomerAnalysisResultEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/CustomerAnalysisResultEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.customer.entity.CustomerAnalysisResultEntity;
+import com.storlead.trade.entity.CustomerAnalysisResultEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/mapper/CustomerBaseEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/CustomerBaseEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.marketing.entity.CustomerBaseEntity;
+import com.storlead.trade.entity.CustomerBaseEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/mapper/CustomerCompanyEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/CustomerCompanyEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.customer.entity.CustomerCompanyEntity;
+import com.storlead.trade.entity.CustomerCompanyEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/mapper/CustomerEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/CustomerEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.customer.entity.CustomerEntity;
+import com.storlead.trade.entity.CustomerEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/mapper/LiaisonEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/LiaisonEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.customer.entity.LiaisonEntity;
+import com.storlead.trade.entity.LiaisonEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/mapper/MarketingCampaignEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/MarketingCampaignEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.marketing.entity.MarketingCampaignEntity;
+import com.storlead.trade.entity.MarketingCampaignEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/mapper/SopDetailMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/SopDetailMapper.java

@@ -1,7 +1,7 @@
-package com.storlead.crm.marketing.mapper;
+package com.storlead.trade.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.storlead.crm.marketing.entity.SopDetailEntity;
+import com.storlead.trade.entity.SopDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/mapper/SopMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/SopMapper.java

@@ -1,7 +1,7 @@
-package com.storlead.crm.marketing.mapper;
+package com.storlead.trade.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.storlead.crm.marketing.entity.SopEntity;
+import com.storlead.trade.entity.SopEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/mapper/TagEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/TagEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.marketing.entity.TagEntity;
+import com.storlead.trade.entity.TagEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/mapper/TemplateEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/TemplateEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.marketing.entity.TemplateEntity;
+import com.storlead.trade.entity.TemplateEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/mapper/TemplateTagEntityMapper.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/mapper/TemplateTagEntityMapper.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.mapper;
+package com.storlead.trade.mapper;
 
-import com.storlead.crm.marketing.entity.TemplateTagEntity;
+import com.storlead.trade.entity.TemplateTagEntity;
 import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 营销记录。
+ */
+package com.storlead.trade;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/CustomerAiAnalysisService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/CustomerAiAnalysisService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.customer.entity.CustomerAnalysisResultEntity;
+import com.storlead.trade.entity.CustomerAnalysisResultEntity;
 
 public interface CustomerAiAnalysisService {
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/CustomerAnalysisResultEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/CustomerAnalysisResultEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.customer.entity.CustomerAnalysisResultEntity;
+import com.storlead.trade.entity.CustomerAnalysisResultEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface CustomerAnalysisResultEntityService extends MyBaseService<CustomerAnalysisResultEntity> {

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/CustomerBaseEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/CustomerBaseEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.marketing.entity.CustomerBaseEntity;
+import com.storlead.trade.entity.CustomerBaseEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface CustomerBaseEntityService extends MyBaseService<CustomerBaseEntity> {

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/CustomerCompanyEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/CustomerCompanyEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.customer.entity.CustomerCompanyEntity;
+import com.storlead.trade.entity.CustomerCompanyEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface CustomerCompanyEntityService extends MyBaseService<CustomerCompanyEntity> {

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/CustomerEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/CustomerEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.customer.entity.CustomerEntity;
+import com.storlead.trade.entity.CustomerEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface CustomerEntityService extends MyBaseService<CustomerEntity> {

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/LiaisonEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/LiaisonEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.customer.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.customer.entity.LiaisonEntity;
+import com.storlead.trade.entity.LiaisonEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface LiaisonEntityService extends MyBaseService<LiaisonEntity> {

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/MarketingCampaignEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/MarketingCampaignEntityService.java

@@ -1,8 +1,8 @@
-package com.storlead.crm.marketing.service;
+package com.storlead.trade.service;
 
 
-import com.storlead.crm.marketing.dto.MarketingCampaignDTO;
-import com.storlead.crm.marketing.entity.MarketingCampaignEntity;
+import com.storlead.trade.dto.MarketingCampaignDTO;
+import com.storlead.trade.entity.MarketingCampaignEntity;
 import com.storlead.framework.common.result.Result;
 import com.storlead.framework.mybatis.service.MyBaseService;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/SopDetailService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/SopDetailService.java

@@ -1,7 +1,7 @@
-package com.storlead.crm.marketing.service;
+package com.storlead.trade.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.storlead.crm.marketing.entity.SopDetailEntity;
+import com.storlead.trade.entity.SopDetailEntity;
 
 /**
  * SOP明细 Service接口

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/SopService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/SopService.java

@@ -1,11 +1,11 @@
-package com.storlead.crm.marketing.service;
+package com.storlead.trade.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.storlead.crm.marketing.dto.SopDetailCreateDTO;
-import com.storlead.crm.marketing.dto.SopDetailUpdateDTO;
-import com.storlead.crm.marketing.dto.SopResponseDTO;
-import com.storlead.crm.marketing.entity.SopEntity;
+import com.storlead.trade.dto.SopDetailCreateDTO;
+import com.storlead.trade.dto.SopDetailUpdateDTO;
+import com.storlead.trade.dto.SopResponseDTO;
+import com.storlead.trade.entity.SopEntity;
 import com.storlead.framework.common.result.Result;
 
 import java.util.List;

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/TagEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/TagEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.marketing.entity.TagEntity;
+import com.storlead.trade.entity.TagEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface TagEntityService extends MyBaseService<TagEntity> {

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/TemplateEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/TemplateEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.marketing.entity.TemplateEntity;
+import com.storlead.trade.entity.TemplateEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface TemplateEntityService extends MyBaseService<TemplateEntity> {

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/TemplateTagEntityService.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/TemplateTagEntityService.java

@@ -1,6 +1,6 @@
-package com.storlead.crm.marketing.service;
+package com.storlead.trade.service;
 
-import com.storlead.crm.marketing.entity.TemplateTagEntity;
+import com.storlead.trade.entity.TemplateTagEntity;
 import com.storlead.framework.mybatis.service.MyBaseService;
 
 public interface TemplateTagEntityService extends MyBaseService<TemplateTagEntity> {

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/impl/CustomerAiAnalysisServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/CustomerAiAnalysisServiceImpl.java

@@ -1,11 +1,12 @@
-package com.storlead.crm.customer.service.impl;
+package com.storlead.trade.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.storlead.crm.customer.entity.CustomerAnalysisResultEntity;
-import com.storlead.crm.customer.entity.CustomerCompanyEntity;
-import com.storlead.crm.customer.entity.CustomerEntity;
-import com.storlead.crm.customer.entity.LiaisonEntity;
-import com.storlead.crm.customer.service.*;
+import com.storlead.trade.entity.CustomerAnalysisResultEntity;
+import com.storlead.trade.entity.CustomerCompanyEntity;
+import com.storlead.trade.entity.CustomerEntity;
+import com.storlead.trade.entity.LiaisonEntity;
+import com.storlead.trade.customer.service.*;
+import com.storlead.trade.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/impl/CustomerAnalysisResultEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/CustomerAnalysisResultEntityServiceImpl.java

@@ -1,8 +1,8 @@
-package com.storlead.crm.customer.service.impl;
+package com.storlead.trade.service.impl;
 
-import com.storlead.crm.customer.entity.CustomerAnalysisResultEntity;
-import com.storlead.crm.customer.mapper.CustomerAnalysisResultEntityMapper;
-import com.storlead.crm.customer.service.CustomerAnalysisResultEntityService;
+import com.storlead.trade.entity.CustomerAnalysisResultEntity;
+import com.storlead.trade.mapper.CustomerAnalysisResultEntityMapper;
+import com.storlead.trade.service.CustomerAnalysisResultEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/impl/CustomerBaseEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/CustomerBaseEntityServiceImpl.java

@@ -1,9 +1,9 @@
-package com.storlead.crm.marketing.service.impl;
+package com.storlead.trade.service.impl;
 
 
-import com.storlead.crm.marketing.entity.CustomerBaseEntity;
-import com.storlead.crm.marketing.mapper.CustomerBaseEntityMapper;
-import com.storlead.crm.marketing.service.CustomerBaseEntityService;
+import com.storlead.trade.entity.CustomerBaseEntity;
+import com.storlead.trade.mapper.CustomerBaseEntityMapper;
+import com.storlead.trade.service.CustomerBaseEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/impl/CustomerCompanyEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/CustomerCompanyEntityServiceImpl.java

@@ -1,8 +1,8 @@
-package com.storlead.crm.customer.service.impl;
+package com.storlead.trade.service.impl;
 
-import com.storlead.crm.customer.entity.CustomerCompanyEntity;
-import com.storlead.crm.customer.mapper.CustomerCompanyEntityMapper;
-import com.storlead.crm.customer.service.CustomerCompanyEntityService;
+import com.storlead.trade.entity.CustomerCompanyEntity;
+import com.storlead.trade.mapper.CustomerCompanyEntityMapper;
+import com.storlead.trade.service.CustomerCompanyEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/impl/CustomerEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/CustomerEntityServiceImpl.java

@@ -1,8 +1,8 @@
-package com.storlead.crm.customer.service.impl;
+package com.storlead.trade.service.impl;
 
-import com.storlead.crm.customer.entity.CustomerEntity;
-import com.storlead.crm.customer.mapper.CustomerEntityMapper;
-import com.storlead.crm.customer.service.CustomerEntityService;
+import com.storlead.trade.entity.CustomerEntity;
+import com.storlead.trade.mapper.CustomerEntityMapper;
+import com.storlead.trade.service.CustomerEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/service/impl/LiaisonEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/LiaisonEntityServiceImpl.java

@@ -1,8 +1,8 @@
-package com.storlead.crm.customer.service.impl;
+package com.storlead.trade.service.impl;
 
-import com.storlead.crm.customer.entity.LiaisonEntity;
-import com.storlead.crm.customer.mapper.LiaisonEntityMapper;
-import com.storlead.crm.customer.service.LiaisonEntityService;
+import com.storlead.trade.entity.LiaisonEntity;
+import com.storlead.trade.mapper.LiaisonEntityMapper;
+import com.storlead.trade.service.LiaisonEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/impl/MarketingCampaignEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/MarketingCampaignEntityServiceImpl.java

@@ -1,17 +1,17 @@
-package com.storlead.crm.marketing.service.impl;
+package com.storlead.trade.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.storlead.crm.marketing.dto.MarketingCampaignDTO;
-import com.storlead.crm.marketing.entity.CustomerBaseEntity;
-import com.storlead.crm.marketing.entity.MarketingCampaignEntity;
-import com.storlead.crm.marketing.mapper.MarketingCampaignEntityMapper;
-import com.storlead.crm.marketing.service.CustomerBaseEntityService;
-import com.storlead.crm.marketing.service.MarketingCampaignEntityService;
-import com.storlead.crm.marketing.vo.MarketingCampaignVO;
+import com.storlead.trade.dto.MarketingCampaignDTO;
+import com.storlead.trade.entity.CustomerBaseEntity;
+import com.storlead.trade.entity.MarketingCampaignEntity;
+import com.storlead.trade.mapper.MarketingCampaignEntityMapper;
+import com.storlead.trade.service.CustomerBaseEntityService;
+import com.storlead.trade.service.MarketingCampaignEntityService;
+import com.storlead.trade.vo.MarketingCampaignVO;
 import com.storlead.framework.common.constant.CommonConstant;
 import com.storlead.framework.common.result.Result;
 import com.storlead.framework.mybatis.entity.SysBaseField;

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

@@ -1,9 +1,9 @@
-package com.storlead.crm.marketing.service.impl;
+package com.storlead.trade.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.storlead.crm.marketing.entity.SopDetailEntity;
-import com.storlead.crm.marketing.mapper.SopDetailMapper;
-import com.storlead.crm.marketing.service.SopDetailService;
+import com.storlead.trade.entity.SopDetailEntity;
+import com.storlead.trade.mapper.SopDetailMapper;
+import com.storlead.trade.service.SopDetailService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -1,20 +1,18 @@
-package com.storlead.crm.marketing.service.impl;
+package com.storlead.trade.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.storlead.crm.marketing.dto.SopCreateDTO;
-import com.storlead.crm.marketing.dto.SopDetailCreateDTO;
-import com.storlead.crm.marketing.dto.SopDetailResponseDTO;
-import com.storlead.crm.marketing.dto.SopDetailUpdateDTO;
-import com.storlead.crm.marketing.dto.SopResponseDTO;
-import com.storlead.crm.marketing.dto.SopUpdateDTO;
-import com.storlead.crm.marketing.entity.SopDetailEntity;
-import com.storlead.crm.marketing.entity.SopEntity;
-import com.storlead.crm.marketing.mapper.SopMapper;
-import com.storlead.crm.marketing.service.SopDetailService;
-import com.storlead.crm.marketing.service.SopService;
+import com.storlead.trade.dto.SopDetailCreateDTO;
+import com.storlead.trade.dto.SopDetailResponseDTO;
+import com.storlead.trade.dto.SopDetailUpdateDTO;
+import com.storlead.trade.dto.SopResponseDTO;
+import com.storlead.trade.entity.SopDetailEntity;
+import com.storlead.trade.entity.SopEntity;
+import com.storlead.trade.mapper.SopMapper;
+import com.storlead.trade.service.SopDetailService;
+import com.storlead.trade.service.SopService;
 import com.storlead.framework.common.result.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -22,7 +20,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/impl/TagEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/TagEntityServiceImpl.java

@@ -1,9 +1,9 @@
-package com.storlead.crm.marketing.service.impl;
+package com.storlead.trade.service.impl;
 
 
-import com.storlead.crm.marketing.entity.TagEntity;
-import com.storlead.crm.marketing.mapper.TagEntityMapper;
-import com.storlead.crm.marketing.service.TagEntityService;
+import com.storlead.trade.entity.TagEntity;
+import com.storlead.trade.mapper.TagEntityMapper;
+import com.storlead.trade.service.TagEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/impl/TempalteEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/TempalteEntityServiceImpl.java

@@ -1,9 +1,9 @@
-package com.storlead.crm.marketing.service.impl;
+package com.storlead.trade.service.impl;
 
 
-import com.storlead.crm.marketing.entity.TemplateEntity;
-import com.storlead.crm.marketing.mapper.TemplateEntityMapper;
-import com.storlead.crm.marketing.service.TemplateEntityService;
+import com.storlead.trade.entity.TemplateEntity;
+import com.storlead.trade.mapper.TemplateEntityMapper;
+import com.storlead.trade.service.TemplateEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/service/impl/TempalteTagEntityServiceImpl.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/service/impl/TempalteTagEntityServiceImpl.java

@@ -1,9 +1,9 @@
-package com.storlead.crm.marketing.service.impl;
+package com.storlead.trade.service.impl;
 
 
-import com.storlead.crm.marketing.entity.TemplateTagEntity;
-import com.storlead.crm.marketing.mapper.TemplateTagEntityMapper;
-import com.storlead.crm.marketing.service.TemplateTagEntityService;
+import com.storlead.trade.entity.TemplateTagEntity;
+import com.storlead.trade.mapper.TemplateTagEntityMapper;
+import com.storlead.trade.service.TemplateTagEntityService;
 import com.storlead.framework.mybatis.service.impl.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/vo/MarketingCampaignVO.java → java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/vo/MarketingCampaignVO.java

@@ -1,11 +1,11 @@
-package com.storlead.crm.marketing.vo;
+package com.storlead.trade.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.storlead.crm.marketing.entity.CustomerBaseEntity;
+import com.storlead.trade.entity.CustomerBaseEntity;
 import com.storlead.framework.mybatis.entity.SysBaseField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

java/storlead-sasa/storlead-trade/storlead-acquisition/README.md

@@ -1,91 +0,0 @@
-# 获客（storlead-acquisition）功能需求文档
-
-对应目录：`storlead-acquisition` · Maven `artifactId`：`storlead-acquisition` · Java 包根：`com.storlead.crm.acquisition`
-
-## 1. 模块目标
-
-本模块核心能力不是渠道投放，而是将业务侧定义的策略和基础画像传给 Python 服务，由 Python 服务执行客户匹配与检索，再将候选客户返回 CRM，供后续入池和跟进。
-
-## 2. 业务场景
-
-1. 运营或销售负责人在 CRM 中配置获客策略（行业、规模、地域、行为标签、预算偏好等）。
-2. 系统将策略与基础画像组装为标准请求，调用 Python 智能匹配服务。
-3. Python 服务返回候选客户列表及匹配分、标签、推荐理由。
-4. CRM 侧落库匹配结果，支持人工筛选、批量入客户池、建立跟进任务。
-
-## 3. 功能范围
-
-### 3.1 策略管理
-
-- 新建/编辑/启停策略。
-- 支持策略版本管理（每次变更形成版本快照）。
-- 支持策略试跑（不入正式结果，仅返回预览）。
-
-### 3.2 业务画像管理
-
-- 维护基础画像模板（行业、企业规模、岗位、地区、关键词、负向关键词等）。
-- 支持画像参数与策略参数合并规则（策略优先、模板兜底）。
-- 支持画像校验（必填项、取值范围、枚举合法性）。
-
-### 3.3 Python 服务对接
-
-- 提供统一调用网关（HTTP/HTTPS）。
-- 支持同步调用（小批量）与异步任务调用（大批量）。
-- 记录请求体、响应体摘要、耗时、状态码、错误码、重试次数。
-- 支持超时控制、重试策略、熔断与降级（避免阻塞主业务）。
-
-### 3.4 匹配结果管理
-
-- 存储候选客户基础信息、匹配得分、命中标签、推荐理由、来源策略版本。
-- 去重与合并（同一客户跨任务命中时保留最新和最高分）。
-- 支持结果筛选（分值区间、标签、区域、时间）与导出。
-- 支持批量转入 `storlead-customer` 模块。
-
-### 3.5 任务与流程
-
-- 支持手动触发与定时触发（如每天 09:00）。
-- 任务状态：待执行、执行中、成功、部分成功、失败、已取消。
-- 失败任务支持重跑，并保留历史执行记录。
-
-### 3.6 权限与多租户
-
-- 按租户隔离策略、画像、任务、匹配结果。
-- 仅授权角色可创建/修改策略与触发任务。
-- 跨租户数据访问严格禁止。
-
-## 4. 外部接口需求（CRM -> Python）
-
-建议统一定义请求对象：
-
-- `tenantId`：租户标识
-- `strategyId` / `strategyVersion`
-- `portrait`：业务画像参数
-- `limit`：期望返回条数
-- `traceId`：链路追踪 ID
-
-Python 返回建议包含：
-
-- `taskId`（同步可选）
-- `candidates`：候选客户集合
-- `score`：匹配分
-- `tags`：命中标签
-- `reason`：推荐理由
-- `status` / `errorCode` / `errorMessage`
-
-## 5. 数据与审计需求
-
-- 所有策略变更要留痕（谁在何时改了什么）。
-- 任务执行要可追踪（入参快照、响应摘要、执行日志）。
-- 对外返回敏感信息需脱敏或按权限控制展示。
-
-## 6. 非功能需求
-
-- 性能：单次同步请求建议 3-5 秒内返回；异步任务支持分页回传。
-- 可用性：Python 服务不可用时，不影响 CRM 其他模块运行。
-- 可观测性：提供任务成功率、平均耗时、失败原因分布监控。
-
-## 7. 与其他模块边界
-
-- 本模块负责“策略/画像编排 + Python 匹配调用 + 结果回收”。
-- 客户入池后的分配与跟进由 `storlead-customer` 负责。
-- 订单、邮件、营销执行分别由 `storlead-order`、`storlead-email`、`storlead-marketing` 负责。

java/storlead-sasa/storlead-trade/storlead-acquisition/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.storlead.boot</groupId>
-        <artifactId>storlead-trade</artifactId>
-        <version>1.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>storlead-acquisition</artifactId>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <description>获客</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-web</artifactId>
-        </dependency>
-    </dependencies>
-</project>

java/storlead-sasa/storlead-trade/storlead-acquisition/src/main/java/com/storlead/crm/acquisition/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 获客模块。
- */
-package com.storlead.crm.acquisition;

java/storlead-sasa/storlead-trade/storlead-customer/README.md

@@ -1,28 +0,0 @@
-# 客户（storlead-customer）
-
-对应目录：`storlead-customer` · Maven `artifactId`：`storlead-customer` · Java 包根：`com.storlead.crm.customerpool`
-
-## 模块定位
-
-集中管理「可跟进的客户线索与联系人」资源，为销售、运营与营销提供统一的客户资产视图与分配能力。
-
-## 建议实现的业务功能
-
-1. **资源入库与归集**  
-   支持从获客、导入、外部系统同步等渠道写入客户/线索；去重、合并、标签与来源标记。
-
-2. **资源池分层与视图**  
-   公海池、部门池、个人库等分层；列表筛选、排序、批量操作；与租户/组织权限一致。
-
-3. **分配与流转**  
-   领取、分配、退回、转移；记录操作人与时间，满足审计与协作。
-
-4. **客户侧摘要入口（可选）**  
-   展示与该客户关联的订单、邮件、营销触达等摘要链接（明细由 `storlead-order`、`storlead-email`、`storlead-marketing` 等子模块提供）。
-
-5. **多租户**  
-   数据按租户隔离；接口与查询落在当前租户上下文。
-
-## 非本模块职责
-
-订单履约、邮件投递与记录详情、营销活动执行明细、获客渠道与表单配置等，分别由 `storlead-order`、`storlead-email`、`storlead-marketing`、`storlead-acquisition` 等子模块负责。

java/storlead-sasa/storlead-trade/storlead-customer/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.storlead.boot</groupId>
-        <artifactId>storlead-trade</artifactId>
-        <version>1.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>storlead-customer</artifactId>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <description>客户资源池</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-web</artifactId>
-        </dependency>
-    </dependencies>
-</project>

java/storlead-sasa/storlead-trade/storlead-customer/src/main/java/com/storlead/crm/customer/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 客户资源池。
- */
-package com.storlead.crm.customerpool;

java/storlead-sasa/storlead-trade/storlead-customer/src/main/resources/mapper/CustomerAnalysisResultEntityMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.storlead.crm.customer.mapper.CustomerAnalysisResultEntityMapper">
-    <!-- 默认 CRUD 由 MyBatis-Plus BaseMapper 提供 -->
-</mapper>

java/storlead-sasa/storlead-trade/storlead-customer/src/main/resources/mapper/CustomerCompanyEntityMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.storlead.crm.customer.mapper.CustomerCompanyEntityMapper">
-    <!-- 默认 CRUD 由 MyBatis-Plus BaseMapper 提供 -->
-</mapper>

java/storlead-sasa/storlead-trade/storlead-customer/src/main/resources/mapper/CustomerEntityMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.storlead.crm.customer.mapper.CustomerEntityMapper">
-    <!-- 默认 CRUD 由 MyBatis-Plus BaseMapper 提供 -->
-</mapper>

java/storlead-sasa/storlead-trade/storlead-customer/src/main/resources/mapper/LiaisonEntityMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.storlead.crm.customer.mapper.LiaisonEntityMapper">
-    <!-- 默认 CRUD 由 MyBatis-Plus BaseMapper 提供 -->
-</mapper>

java/storlead-sasa/storlead-trade/storlead-marketing/README.md

@@ -1,145 +0,0 @@
-# 营销（storlead-marketing）功能需求与设计说明
-
-对应目录：`storlead-marketing` · Maven `artifactId`：`storlead-marketing` · Java 包根：`com.storlead.crm.marketing`
-
-## 1. 模块目标
-
-基于“创建营销活动”四步向导，为销售团队提供可执行、可追踪、可自动化的邮件营销能力。当前版本聚焦邮件渠道，不包含 WhatsApp、LinkedIn、微信企业号等多渠道触达。
-
-## 2. 核心业务流程（四步向导）
-
-1. **基本信息**：定义活动名称、类型、优先级、周期、负责人、活动描述和活动目标。
-2. **目标客户**：基于客户分群和筛选条件圈定触达对象，形成目标客户包。
-3. **触达渠道**：配置邮件触达参数（发件账号、发送策略、模板、主题、正文）。
-4. **自动化规则**：配置 SOP 序列和跟进规则，保存并执行活动。
-
-## 2.1 智能寻客任务展示约束（新增）
-
-- 营销侧“智能寻客任务”展示区的数据来源，必须是用户在“创建智能寻客任务”流程中实际创建并保存成功的任务数据。
-- 展示层禁止使用硬编码、Mock 假数据或与任务主记录无关联的缓存拼装数据。
-- 任务列表最少展示：任务名称、创建人、创建时间、当前状态、目标客户规模、最近执行时间。
-- 任务详情需要可回溯到创建时配置：策略条件、画像参数、筛选条件、渠道选择与自动化规则版本。
-- 当创建任务被修改或重跑后，展示页需实时反映最新任务版本，并保留历史执行记录入口。
-
-## 3. 详细功能需求
-
-### 3.1 基本信息页
-
-#### 功能项
-
-- 活动基础字段维护：活动名称、活动类型、优先级、开始日期、结束日期、负责人、活动描述。
-- 活动目标输入：支持录入本次活动目标值（如触达量、打开量、回复量等）。
-- AI 辅助：支持“一键生成活动名称”“智能生成活动描述和策略”。
-
-#### 设计要求
-
-- 页面校验：活动名称、负责人、开始/结束日期为必填。
-- 日期校验：结束日期不能早于开始日期。
-- 目标值校验：仅允许非负整数。
-- 当前版本去除“关联商机”和“商机数”目标字段。
-
-### 3.2 目标客户页
-
-#### 功能项
-
-- 预设客户包：全部潜客、本周新增、高意向客户、沉默客户。
-- AI 智能推荐客户包（系统可按活动类型推荐优先人群）。
-- 高级筛选：地区、行业、意向分数、客户规模、关键词搜索。
-- 结果展示：展示已选择客户数、来源分布，并支持“预览客户”。
-
-#### 设计要求
-
-- “已选择客户”数量需实时更新，并作为下一步可执行前置条件。
-- 支持“清除筛选”和回退上一步后保留筛选条件。
-- 当前版本去除“客户阶段”“采购意向”两个筛选维度。
-
-### 3.3 触达渠道页（当前仅邮件）
-
-#### 功能项
-
-- 渠道选择：只启用“邮件营销”。
-- 邮件发送设置：发件邮箱、发送时间（含 AI 推荐时段）、单批发送量。
-- 内容设置：邮件模板、邮件主题、邮件正文、AI 生成正文。
-- 追踪设置：邮件打开追踪。
-
-#### 设计要求
-
-- 仅允许单渠道邮件，不展示或不启用 WhatsApp、LinkedIn、微信企业号。
-- 邮件主题必填，正文必填（或由 AI 生成后自动填充）。
-- 发件邮箱必须是已验证账号。
-- 当前版本不启用“追踪链接点击”“追踪客户回复”勾选项。
-- 当前版本不展示“渠道效果预测”卡片（预计打开率/回复率/转化率）。
-
-### 3.4 自动化规则页
-
-#### 功能项
-
-- SOP 序列模板：标准开发序列、快速跟进序列、培育序列、唤醒序列。
-- 序列步骤展示：按顺序显示动作（邮件、电话等），支持重定义步骤文案。
-- 跟进规则开关：  
-  - 未打开邮件自动跟进（可配置等待天数）  
-  - 未点击链接跟进（可配置等待天数）  
-  - 客户回复后停止自动化
-
-#### 设计要求
-
-- 规则粒度为“活动级”，生效范围是本活动所有目标客户。
-- 等待天数支持可配置下拉值（如 1/3/5/7 天）。
-- 规则冲突时优先级：停止类规则 > 跟进类规则。
-- 当前版本去除“未回复自动跟进（依赖 WhatsApp/LinkedIn）”与“客户预约后停止自动化”。
-
-## 4. 活动状态与执行设计
-
-### 状态定义
-
-- 草稿：向导未完成或仅保存未提交。
-- 待执行：已配置完成，等待到达发送时间。
-- 执行中：发送任务或自动化规则正在运行。
-- 已完成：活动执行完毕且无后续动作。
-- 已暂停：人工暂停，不再触发自动动作。
-
-### 状态流转
-
-- 草稿 -> 待执行 -> 执行中 -> 已完成
-- 执行中 -> 已暂停（人工操作）
-- 已暂停 -> 执行中（恢复）
-
-## 5. 数据展示与运营支持
-
-- 活动列表需支持按状态、负责人、日期范围筛选。
-- 活动详情需展示：
-  - 目标客户规模
-  - 实际触达数
-  - 邮件打开表现
-  - 自动化规则命中次数
-- 支持活动复用：以历史活动为模板创建新活动。
-
-## 6. 权限与边界
-
-### 权限
-
-- 活动创建/编辑：营销负责人及授权角色。
-- 活动审批/发布（如有）：管理角色。
-- 查看权限：按租户和团队范围隔离。
-
-### 模块边界
-
-- 本模块负责活动编排、目标客户圈选、邮件触达配置、自动化规则执行编排。
-- 邮件底层投递能力由 `storlead-email` 或基础消息能力承接。
-- 客户主数据维护由 `storlead-customer` 承接。
-
-## 7. 本期范围说明（与页面标注一致）
-
-本期保留：
-
-- 邮件营销单渠道
-- 客户分群与高级筛选（不含客户阶段/采购意向）
-- SOP 模板与基础自动化规则
-
-本期不做：
-
-- WhatsApp、LinkedIn、微信企业号渠道
-- 关联商机与商机目标字段
-- 链接点击与客户回复追踪
-- 触达效果预测卡片
-- 依赖外部 IM 渠道的自动跟进规则

java/storlead-sasa/storlead-trade/storlead-marketing/pom.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.storlead.boot</groupId>
-        <artifactId>storlead-trade</artifactId>
-        <version>1.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>storlead-marketing</artifactId>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-    <description>营销记录</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-web</artifactId>
-        </dependency>
-    </dependencies>
-</project>

java/storlead-sasa/storlead-trade/storlead-marketing/src/main/java/com/storlead/crm/marketing/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 营销记录。
- */
-package com.storlead.crm.marketing;

ui/smarttrade-platform/docs/generate_excel.cjs

@@ -170,7 +170,7 @@ XLSX.utils.book_append_sheet(wb, ws3, "知识库模块");
 XLSX.utils.book_append_sheet(wb, ws4, "汇总统计");
 
 // 保存文件
-const outputPath = 'C:\\Users\\Administrator\\.qclaw\\workspace\\tradebrain-crm\\docs\\领存智贸AI CRM-三级功能清单.xlsx';
+const outputPath = 'C:\\Users\\Administrator\\.qclaw\\workspace\\tradebrain-trade\\docs\\领存智贸AI CRM-三级功能清单.xlsx';
 XLSX.writeFile(wb, outputPath);
 
 console.log('Excel文件已生成:', outputPath);

ui/smarttrade-platform/docs/generate_excel.js

@@ -170,7 +170,7 @@ XLSX.utils.book_append_sheet(wb, ws3, "知识库模块");
 XLSX.utils.book_append_sheet(wb, ws4, "汇总统计");
 
 // 保存文件
-const outputPath = 'C:\\Users\\Administrator\\.qclaw\\workspace\\tradebrain-crm\\docs\\领存智贸AI CRM-三级功能清单.xlsx';
+const outputPath = 'C:\\Users\\Administrator\\.qclaw\\workspace\\tradebrain-trade\\docs\\领存智贸AI CRM-三级功能清单.xlsx';
 XLSX.writeFile(wb, outputPath);
 
 console.log('Excel文件已生成:', outputPath);