保存卖家信息解析为逻辑路径

订单表字段改名
视频返回新增字段

.gitea/workflows/master_sellrt_build_manual.yaml

@@ -4,7 +4,8 @@ on:
 
 jobs:
   build_and_deploy:
-    runs-on: ubuntu-latest
+    runs-on: java21
+
     outputs:
       build_status: ${{ job.status }}
       build_url: ${{ gitea.server_url }}/${{ gitea.repository.owner.name }}/${{ gitea.repository.name }}/actions/runs/${{ gitea.run_id }}
@@ -26,52 +27,20 @@ jobs:
         with:
           ref: master
 
-      - name: 2.Set up JDK 21
-        uses: actions/setup-java@v5
+
+      - name: 3.缓存 Maven 依赖
+        uses: actions/cache@v5
         with:
-          java-version: '21'
-          distribution: 'temurin'
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
 
-      - name: 3.设置JAVA Maven 环境
+      - name: 4.构建项目
         run: |
-          # 适配root/普通用户
-          SUDO=""
-          [ "$(id -u)" != "0" ] && SUDO="sudo"
-
-          # 安装依赖
-          $SUDO apt update && $SUDO apt install -y wget tar --no-install-recommends
-
-          # 下载Maven
-          MAVEN_VERSION="3.9.11"
-          MAVEN_TAR="apache-maven-${MAVEN_VERSION}-bin.tar.gz"
-          MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/${MAVEN_TAR}"
-          wget --no-verbose -O /tmp/${MAVEN_TAR} ${MAVEN_URL}
-
-          # 解压+软链接
-          $SUDO tar -xzf /tmp/${MAVEN_TAR} -C /usr/local/
-          $SUDO ln -sf /usr/local/apache-maven-${MAVEN_VERSION} /usr/local/maven
-
-          # 配置PATH
-          echo "/usr/local/maven/bin" >> $GITHUB_PATH
-          export PATH="/usr/local/maven/bin:$PATH"
-
-          # 验证
-          mvn -v 
-
-      - name: 4.构建jar包
-        run: |
-          echo "===== 开始构建JAR包 ====="
-              # 新增：打印当前构建分支（两种方式双重确认）
-          echo "当前工作目录分支：$(git branch --show-current)"
-          echo "Gitea检出分支:${{ github.ref_name }}"
-          echo "预期构建分支: master"
-          echo "========================"
-          mvn -B clean install -DskipTests -Pdev 2>&1
-          # 检查构建是否成功
-          if [ $? -ne 0 ]; then
-          echo "JAR包构建失败!"
-          exit 1
-          fi
+          java -version
+          mvn -v
+          mvn clean package -DskipTests
 
       - name: 5.生成Dockerfile
         run: |
@@ -81,7 +50,7 @@ jobs:
           VOLUME /tmp
           RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
           RUN echo 'Asia/Shanghai' > /etc/timezone
-          ADD ./aida-seller-1.0.0.jar /app.jar
+          ADD ./*.jar /app.jar
           ENTRYPOINT ["java","-jar","/app.jar"]
           EOF
           echo "Dockerfile内容:"
@@ -93,7 +62,7 @@ jobs:
           cat > docker-compose.yml << 'EOF'
           version: '3'
           services:
-            aida_back:
+            master-aida-seller:
               container_name: master-aida-seller
               build: .
               volumes:
@@ -102,46 +71,41 @@ jobs:
                 - ./temp:/temp
                 - ./uploads:/temp/uploads
               ports:
-                - '10093:5567'
+                - '10093:10093'
               restart: always
           EOF
           # 验证docker-compose.yml生成
           echo "docker-compose.yml内容:"
           cat docker-compose.yml
 
-      - name: 7.安装SSH工具
-        run: |
-          $SUDO apt install -y sshpass openssh-client --no-install-recommends
-          # 配置SSH免密
-          mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_KEY }}" > ~/.ssh/id_rsa
-          chmod 600 ~/.ssh/id_rsa
-          ssh-keyscan -H ${{ secrets.SERVER_HOST }} >> ~/.ssh/known_hosts
+      - name: 7.上传jar到远程服务器
+        uses: appleboy/scp-action@master
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          port: 22
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "target/*.jar,Dockerfile,docker-compose.yml"
+          target: ${{ env.REMOTE_DEPLOY_PATH }}
+          preserve_host_directory_structure: false
 
-      - name: 8.同步文件到远程服务器
-        run: |
-          echo "===== 同步文件到远程服务器 ====="
-          # 使用scp同步文件
-          scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-            ./target/*.jar ./Dockerfile ./docker-compose.yml \
-            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }}:${{ env.REMOTE_DEPLOY_PATH }} 2>&1
-
-      - name: 9.部署和运行服务
-        run: |
-          echo "===== 开始部署服务 ====="
-          # SSH执行部署命令
-          ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-            ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF_SSH'
+      - name: 8. 重启 Docker 服务
+        uses: appleboy/ssh-action@master   # 👈 专门执行命令的 action
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          key_base64: true
+          script: |
+            echo "========= 进入部署目录 ========="
             cd ${{ env.REMOTE_DEPLOY_PATH }}
-            echo "停止旧容器..."
-            docker compose down || true
-            echo "清理Docker资源..."
-            docker system prune -f
-            echo "构建镜像..."
-            docker compose build --no-cache
-            echo "启动服务..."
-            docker compose up -d
-            echo "验证容器状态..."
-            docker compose ps
-            echo "部署完成！"
-          EOF_SSH
+            ls -l
+            
+            echo "========= 停止旧服务 ========="
+            docker compose down
+            
+            echo "========= 启动新服务 ========="
+            docker compose up -d --build
+            
+            echo "========= 查看运行状态 ========="
+            docker compose ps

.gitignore

@@ -1 +1,2 @@
 /target/
+/log/

pom.xml

@@ -24,7 +24,7 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <mybatis-plus.version>3.5.6</mybatis-plus.version>
+        <mybatis-plus.version>3.5.7</mybatis-plus.version>
         <minio.version>8.5.7</minio.version>
         <jwt.version>0.12.3</jwt.version>
         <hutool.version>5.8.26</hutool.version>
@@ -63,6 +63,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <!-- Spring Boot Logging（显式引入，确保 logback 正确初始化） -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-logging</artifactId>
+        </dependency>
+
         <!-- Spring Boot Validation -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -86,7 +92,7 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <scope>runtime</scope>
+            <version>8.2.0</version>
         </dependency>
 
         <!-- MinIO -->
@@ -149,12 +155,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
 
         <!-- ==================== 微服务 ==================== -->
         <dependency>
@@ -185,6 +185,8 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
+                    <!-- 强制工作目录为模块根目录，确保 ./log 指向项目目录而非 Maven 安装目录 -->
+                    <workingDirectory>${project.basedir}</workingDirectory>
                     <excludes>
                         <exclude>
                             <groupId>org.projectlombok</groupId>

src/main/java/com/aida/seller/AidaSellerApplication.java

@@ -5,11 +5,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 @MapperScan("com.aida.seller.module.*.mapper")
 @EnableFeignClients
 @EnableDiscoveryClient
+@ComponentScan(basePackages = "com.aida.seller")
 public class AidaSellerApplication {
 
     public static void main(String[] args) {

src/main/java/com/aida/seller/config/MyBatisPlusConfig.java

@@ -1,16 +1,14 @@
 package com.aida.seller.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
-import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import java.time.LocalDateTime;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
+@EnableTransactionManagement
 public class MyBatisPlusConfig {
 
     @Bean
@@ -19,20 +17,4 @@ public class MyBatisPlusConfig {
         interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
         return interceptor;
     }
-
-    @Bean
-    public MetaObjectHandler metaObjectHandler() {
-        return new MetaObjectHandler() {
-            @Override
-            public void insertFill(MetaObject metaObject) {
-                this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
-                this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
-            }
-
-            @Override
-            public void updateFill(MetaObject metaObject) {
-                this.strictUpdateFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
-            }
-        };
-    }
 }

src/main/java/com/aida/seller/config/MyMetaObjectHandler.java

@@ -0,0 +1,23 @@
+package com.aida.seller.config;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+import java.time.LocalDateTime;
+
+@Component
+public class MyMetaObjectHandler implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        this.setFieldValByName("createTime", LocalDateTime.now(), metaObject);
+        this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+        this.strictInsertFill(metaObject, "createTime", LocalDateTime.class, LocalDateTime.now());
+        this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);
+    }
+}

src/main/java/com/aida/seller/config/PrimaryDataSourceConfig.java

@@ -1,6 +1,7 @@
 package com.aida.seller.config;
 
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -24,6 +25,9 @@ public class PrimaryDataSourceConfig {
     @Autowired
     private MybatisPlusInterceptor mybatisPlusInterceptor;
 
+    @Autowired
+    private MetaObjectHandler myMetaObjectHandler;
+
     @Primary
     @Bean(name = "primaryDataSource")
     @ConfigurationProperties(prefix = "spring.datasource.primary")
@@ -42,6 +46,7 @@ public class PrimaryDataSourceConfig {
 
         GlobalConfig globalConfig = new GlobalConfig();
         globalConfig.setBanner(false);
+        globalConfig.setMetaObjectHandler(myMetaObjectHandler);
         bean.setGlobalConfig(globalConfig);
 
         bean.setPlugins(mybatisPlusInterceptor);

src/main/java/com/aida/seller/module/designer/controller/DesignerController.java

@@ -8,12 +8,16 @@ import com.aida.seller.module.designer.dto.DesignerAuditDTO;
 import com.aida.seller.module.designer.dto.DesignerDTO;
 import com.aida.seller.module.designer.entity.DesignerEntity;
 import com.aida.seller.module.designer.service.DesignerService;
+import com.aida.seller.module.designer.vo.DesignerSearchVO;
+import com.aida.seller.module.designer.vo.DesignerShopVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Tag(name = "设计师入驻管理")
 @RestController
 @RequestMapping("/designer")
@@ -87,4 +91,28 @@ public class DesignerController {
         DesignerDTO designerInfo = designerService.getDesignerInfo(userId);
         return Response.success(designerInfo);
     }
+
+    @Operation(summary = "删除设计师", description = "根据当前登录用户ID逻辑删除设计师及其所有关联数据（订单、订单明细、商品、商品图片）")
+    @DeleteMapping("/delete")
+    public Response<Void> delete() {
+        Long userId = UserContext.getUserId();
+        designerService.deleteByUserId(userId);
+        return Response.success();
+    }
+
+    @Operation(summary = "搜索设计师", description = "根据关键词不区分大小写同时匹配店铺名称和所有者姓名，返回设计师信息、最近5张商品封面图（按updateTime倒序）、商品总数")
+    @GetMapping("/search")
+    public Response<List<DesignerSearchVO>> search(
+            @Parameter(description = "关键词（同时匹配店铺名称和所有者姓名，不区分大小写）") @RequestParam String keyword) {
+        List<DesignerSearchVO> result = designerService.searchDesigners(keyword);
+        return Response.success(result);
+    }
+
+    @Operation(summary = "获取设计师店铺详情", description = "根据 sellerId（即 卖家userId）获取店铺公开信息，供买家端店铺主页调用")
+    @GetMapping("/shop/{sellerId}")
+    public Response<DesignerShopVO> getShopDetail(
+            @Parameter(description = "设计师用户ID") @PathVariable Long sellerId) {
+        DesignerShopVO vo = designerService.getShopDetailBySellerId(sellerId);
+        return Response.success(vo);
+    }
 }

src/main/java/com/aida/seller/module/designer/dto/DesignerAuditDTO.java

@@ -1,5 +1,7 @@
 package com.aida.seller.module.designer.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

src/main/java/com/aida/seller/module/designer/entity/DesignerEntity.java

@@ -1,6 +1,8 @@
 package com.aida.seller.module.designer.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -16,6 +18,7 @@ public class DesignerEntity implements Serializable {
 
     /** 设计师ID */
     @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
     
     /** 用户ID(关联用户表) */

src/main/java/com/aida/seller/module/designer/service/DesignerService.java

@@ -4,9 +4,13 @@ import com.aida.seller.module.designer.dto.DesignerApplyDTO;
 import com.aida.seller.module.designer.dto.DesignerAuditDTO;
 import com.aida.seller.module.designer.dto.DesignerDTO;
 import com.aida.seller.module.designer.entity.DesignerEntity;
+import com.aida.seller.module.designer.vo.DesignerSearchVO;
+import com.aida.seller.module.designer.vo.DesignerShopVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 public interface DesignerService extends IService<DesignerEntity> {
 
     /**
@@ -49,4 +53,29 @@ public interface DesignerService extends IService<DesignerEntity> {
      * 获取设计师详细信息
      */
     DesignerDTO getDesignerInfo(Long userId);
+
+    /**
+     * 删除设计师（逻辑删除）及其所有关联数据
+     * <p>级联删除：seller_designer（按userId）→ seller_orders → seller_order_item、
+     * seller_listing → seller_listing_image</p>
+     *
+     * @param userId 用户ID
+     */
+    void deleteByUserId(Long userId);
+
+    /**
+     * 模糊搜索设计师（不区分大小写），返回设计师信息及关联商品封面列表
+     *
+     * @param keyword 关键词（同时匹配店铺名称和所有者姓名，不区分大小写）
+     * @return 搜索结果列表，每条包含设计师基础信息、最近5张商品封面图（按updateTime倒序）、商品总数
+     */
+    List<DesignerSearchVO> searchDesigners(String keyword);
+
+    /**
+     * 根据 sellerId（即 userId）获取设计师店铺详情，供买家端店铺主页调用
+     *
+     * @param sellerId 设计师用户ID
+     * @return 店铺详情
+     */
+    DesignerShopVO getShopDetailBySellerId(Long sellerId);
 }

src/main/java/com/aida/seller/module/designer/service/DesignerServiceImpl.java

@@ -9,6 +9,16 @@ import com.aida.seller.module.designer.dto.DesignerDTO;
 import com.aida.seller.module.designer.entity.DesignerEntity;
 import com.aida.seller.module.designer.enums.DesignerApplyStatusEnum;
 import com.aida.seller.module.designer.mapper.DesignerMapper;
+import com.aida.seller.module.designer.vo.DesignerSearchVO;
+import com.aida.seller.module.designer.vo.DesignerShopVO;
+import com.aida.seller.module.listing.entity.ListingEntity;
+import com.aida.seller.module.listing.entity.ListingImageEntity;
+import com.aida.seller.module.listing.mapper.ListingImageMapper;
+import com.aida.seller.module.listing.mapper.ListingMapper;
+import com.aida.seller.module.order.entity.OrderInfoEntity;
+import com.aida.seller.module.order.entity.OrderItemEntity;
+import com.aida.seller.module.order.mapper.OrderInfoMapper;
+import com.aida.seller.module.order.mapper.OrderItemMapper;
 import com.aida.seller.util.MinioUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,6 +27,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 import java.time.LocalDateTime;
 
@@ -25,6 +40,11 @@ import java.time.LocalDateTime;
 public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEntity> implements DesignerService {
 
     private final MinioUtil minioUtil;
+    private final OrderInfoMapper orderInfoMapper;
+    private final OrderItemMapper orderItemMapper;
+    private final ListingMapper listingMapper;
+    private final ListingImageMapper listingImageMapper;
+
     @Override
     public Boolean checkQualification(Long userId) {
         DesignerEntity entity = this.getOne(
@@ -57,8 +77,16 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
         DesignerEntity entity = new DesignerEntity();
         entity.setUserId(UserContext.getUserId());
         entity.setShopName(dto.getShopName());
-        entity.setAvatar(minioUtil.convertToLogicalPath(dto.getAvatar()));
-        entity.setBrandBanner(minioUtil.convertToLogicalPath(dto.getBrandBanner()));
+        entity.setAvatar(
+                dto.getAvatar() != null && !dto.getAvatar().isBlank()
+                        ? minioUtil.convertToLogicalPath(dto.getAvatar())
+                        : null
+        );
+        entity.setBrandBanner(
+                dto.getBrandBanner() != null && !dto.getBrandBanner().isBlank()
+                        ? minioUtil.convertToLogicalPath(dto.getBrandBanner())
+                        : null
+        );
         entity.setOwnerName(dto.getOwnerName());
         entity.setEmail(dto.getEmail());
         entity.setMobile(dto.getMobile());
@@ -162,12 +190,16 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
         if (dto.getShopName() != null) {
             entity.setShopName(dto.getShopName());
         }
-        if (dto.getAvatar() != null) {
-            entity.setAvatar(dto.getAvatar());
-        }
-        if (dto.getBrandBanner() != null) {
-            entity.setBrandBanner(dto.getBrandBanner());
-        }
+        entity.setAvatar(
+                dto.getAvatar() != null && !dto.getAvatar().isBlank()
+                        ? minioUtil.convertToLogicalPath(dto.getAvatar())
+                        : null
+        );
+        entity.setBrandBanner(
+                dto.getBrandBanner() != null && !dto.getBrandBanner().isBlank()
+                        ? minioUtil.convertToLogicalPath(dto.getBrandBanner())
+                        : null
+        );
         if (dto.getOwnerName() != null) {
             entity.setOwnerName(dto.getOwnerName());
         }
@@ -210,4 +242,157 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
 
         return dto;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByUserId(Long userId) {
+        DesignerEntity designer = this.getOne(
+            new LambdaQueryWrapper<DesignerEntity>()
+                .eq(DesignerEntity::getUserId, userId)
+                .last("LIMIT 1")
+        );
+        if (designer == null) {
+            throw new BusinessException("设计师记录不存在");
+        }
+
+        Long sellerId = designer.getId();
+
+        // 1. 查询所有关联的 listing_id，再删除 listing 及其图片
+        List<ListingEntity> listings = listingMapper.selectList(
+            new LambdaQueryWrapper<ListingEntity>()
+                .eq(ListingEntity::getSellerId, sellerId)
+        );
+        if (!listings.isEmpty()) {
+            List<Long> listingIds = listings.stream()
+                .map(ListingEntity::getId)
+                .collect(Collectors.toList());
+
+            // 逻辑删除关联的图片
+            listingImageMapper.delete(
+                new LambdaQueryWrapper<ListingImageEntity>()
+                    .in(ListingImageEntity::getListingId, listingIds)
+            );
+            // 逻辑删除 listing
+            listingMapper.delete(
+                new LambdaQueryWrapper<ListingEntity>()
+                    .eq(ListingEntity::getSellerId, sellerId)
+            );
+        }
+
+        // 2. 删除 seller_orders 及关联的 order_item
+        List<OrderInfoEntity> orders = orderInfoMapper.selectList(
+            new LambdaQueryWrapper<OrderInfoEntity>()
+                .eq(OrderInfoEntity::getSellerId, sellerId)
+        );
+        if (!orders.isEmpty()) {
+            List<Long> orderIds = orders.stream()
+                .map(OrderInfoEntity::getId)
+                .collect(Collectors.toList());
+
+            // 逻辑删除关联的订单明细
+            orderItemMapper.delete(
+                new LambdaQueryWrapper<OrderItemEntity>()
+                    .in(OrderItemEntity::getOrderId, orderIds)
+            );
+            // 逻辑删除订单
+            orderInfoMapper.delete(
+                new LambdaQueryWrapper<OrderInfoEntity>()
+                    .eq(OrderInfoEntity::getSellerId, sellerId)
+            );
+        }
+
+        // 3. 逻辑删除设计师本人
+        this.removeById(sellerId);
+    }
+
+    @Override
+    public List<DesignerSearchVO> searchDesigners(String keyword) {
+        // Step 1: 构造设计师模糊查询条件，同时匹配店铺名称和所有者姓名，不区分大小写
+        LambdaQueryWrapper<DesignerEntity> designerQuery = new LambdaQueryWrapper<>();
+
+        if (StringUtils.hasText(keyword)) {
+            designerQuery.and(wrapper -> wrapper
+                .apply("LOWER(shop_name) LIKE LOWER({0})", "%" + keyword + "%")
+                .or()
+                .apply("LOWER(owner_name) LIKE LOWER({0})", "%" + keyword + "%")
+            );
+        }
+
+        List<DesignerEntity> designers = this.list(designerQuery);
+        if (designers.isEmpty()) {
+            return List.of();
+        }
+
+        // Step 2: 提取设计师的 userId 集合，用于后续按 userId 查询其关联商品
+        List<Long> userIds = designers.stream()
+            .map(DesignerEntity::getUserId)
+            .collect(Collectors.toList());
+
+        // Step 3: 查询所有匹配设计师关联的商品，按 updateTime 倒序
+        LambdaQueryWrapper<ListingEntity> listingQuery = new LambdaQueryWrapper<ListingEntity>()
+            .in(ListingEntity::getSellerId, userIds)
+            .orderByDesc(ListingEntity::getUpdateTime);
+        List<ListingEntity> listings = listingMapper.selectList(listingQuery);
+
+        if (listings.isEmpty()) {
+            return designers.stream().map(d -> buildSearchVO(d, List.of(), 0L))
+                .collect(Collectors.toList());
+        }
+
+        // Step 4: 按 sellerId 分组，统计每个设计师的商品总数
+        Map<Long, Long> listingCountMap = listings.stream()
+            .collect(Collectors.groupingBy(
+                ListingEntity::getSellerId,
+                Collectors.counting()
+            ));
+
+        // Step 5: 按 sellerId 分组，便于后续取每个设计师的商品列表
+        Map<Long, List<ListingEntity>> listingsByDesigner = listings.stream()
+            .collect(Collectors.groupingBy(ListingEntity::getSellerId));
+
+        // Step 6: 组装每个设计师的搜索结果，最多取 5 个商品封面图
+        return designers.stream().map(d -> {
+            List<String> covers = listingsByDesigner
+                .getOrDefault(d.getId(), List.of())
+                .stream()
+                .filter(l -> l.getCover() != null && !l.getCover().isBlank())
+                .limit(5)
+                .map(l -> minioUtil.processMinioResource(l.getCover(), CommonConstants.MINIO_PATH_TIMEOUT))
+                .collect(Collectors.toList());
+
+            long listingTotal = listingCountMap.getOrDefault(d.getId(), 0L);
+            return buildSearchVO(d, covers, listingTotal);
+        }).collect(Collectors.toList());
+    }
+
+    private DesignerSearchVO buildSearchVO(DesignerEntity entity, List<String> covers, Long listingTotal) {
+        DesignerSearchVO vo = new DesignerSearchVO();
+        vo.setSellerId(entity.getUserId());
+        vo.setShopName(entity.getShopName());
+        vo.setOwnerName(entity.getOwnerName());
+        vo.setAvatar(minioUtil.processMinioResource(entity.getAvatar(), CommonConstants.MINIO_PATH_TIMEOUT));
+        vo.setCovers(covers);
+        vo.setListingTotal(listingTotal);
+        return vo;
+    }
+
+    @Override
+    public DesignerShopVO getShopDetailBySellerId(Long sellerId) {
+        DesignerEntity entity = this.getOne(
+            new LambdaQueryWrapper<DesignerEntity>()
+                .eq(DesignerEntity::getUserId, sellerId)
+                .last("LIMIT 1")
+        );
+        if (entity == null) {
+            throw new BusinessException("设计师不存在");
+        }
+        DesignerShopVO vo = new DesignerShopVO();
+        vo.setShopName(entity.getShopName());
+        vo.setAvatar(minioUtil.processMinioResource(entity.getAvatar(), CommonConstants.MINIO_PATH_TIMEOUT));
+        vo.setBrandBanner(minioUtil.processMinioResource(entity.getBrandBanner(), CommonConstants.MINIO_PATH_TIMEOUT));
+        vo.setOwnerName(entity.getOwnerName());
+        vo.setDescription(entity.getDescription());
+        vo.setSocialLinks(entity.getSocialLinks());
+        return vo;
+    }
 }

src/main/java/com/aida/seller/module/designer/vo/DesignerApplyDetailVo.java

@@ -1,5 +1,7 @@
 package com.aida.seller.module.designer.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import java.io.Serializable;
@@ -14,8 +16,6 @@ public class DesignerApplyDetailVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "设计师ID")
-    private Long id;
 
     @Schema(description = "店铺名称")
     private String shopName;

src/main/java/com/aida/seller/module/designer/vo/DesignerSearchVO.java

@@ -0,0 +1,36 @@
+package com.aida.seller.module.designer.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 设计师搜索结果VO
+ */
+@Data
+public class DesignerSearchVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 用户ID */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long sellerId;
+
+    /** 店铺名称 */
+    private String shopName;
+
+    /** 所有者全名 */
+    private String ownerName;
+
+    /** 店铺头像URL */
+    private String avatar;
+
+    /** 商品封面图列表（最多5张，按更新时间倒序） */
+    private List<String> covers;
+
+    /** 该设计师的商品总数 */
+    private Long listingTotal;
+}

src/main/java/com/aida/seller/module/designer/vo/DesignerShopVO.java

@@ -0,0 +1,32 @@
+package com.aida.seller.module.designer.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设计师店铺详情VO，供买家端店铺主页调用
+ */
+@Data
+public class DesignerShopVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /** 店铺名称 */
+    private String shopName;
+
+    /** 店铺头像URL */
+    private String avatar;
+
+    /** 品牌 Banner URL */
+    private String brandBanner;
+
+    /** 所有者全名 */
+    private String ownerName;
+
+    /** 店铺简介 */
+    private String description;
+
+    /** 社交媒体链接（JSON 字符串） */
+    private String socialLinks;
+}

src/main/java/com/aida/seller/module/listing/controller/ListingController.java

@@ -29,9 +29,9 @@ public class ListingController {
     @Operation(summary = "批量保存/更新商品", description = "根据 id 是否存在判断新增或更新，同时保存图片")
     @PostMapping("/batch")
     public Response<Void> saveOrUpdate(
-            @Parameter(description = "商品保存/更新表单") @RequestBody ListingSaveDTO dto) {
+            @Parameter(description = "商品保存/更新表单列表") @RequestBody List<ListingSaveDTO> dtoList) {
         Long sellerId = UserContext.getUserId();
-        listingService.saveOrUpdate(dto, sellerId);
+        listingService.saveOrUpdate(dtoList, sellerId);
         return Response.success();
     }
 
@@ -68,15 +68,6 @@ public class ListingController {
         return Response.success();
     }
 
-    @Operation(summary = "批量设置库存", description = "入参为商品ID和库存值列表")
-    @PutMapping("/stock/batch")
-    public Response<Void> batchUpdateStock(
-            @Parameter(description = "库存更新列表") @RequestBody List<ListingStockDTO> list) {
-        Long sellerId = UserContext.getUserId();
-        listingService.batchUpdateStock(list, sellerId);
-        return Response.success();
-    }
-
     @Operation(summary = "设置弹窗提醒标志", description = "在Redis中设置7天过期的弹窗提醒标志")
     @PostMapping("/popup/set")
     public Response<Void> setPopupReminder() {
@@ -92,4 +83,15 @@ public class ListingController {
         boolean needPopup = listingService.checkPopupReminder(sellerId);
         return Response.success(needPopup ? 1 : 0);
     }
+
+    @Operation(summary = "获取店铺商品列表", description = "按 status=1、deleted=0、designFor 筛选，返回店铺已发布商品分页列表")
+    @GetMapping("/shop")
+    public Response<PageResponse<ListingPageVO>> getShopListings(
+            @Parameter(description = "设计师用户ID") @RequestParam Long sellerId,
+            @Parameter(description = "适用性别 female/male/all") @RequestParam String designFor,
+            @Parameter(description = "页码") @RequestParam(defaultValue = "1") int pageNum,
+            @Parameter(description = "每页数量") @RequestParam(defaultValue = "10") int pageSize) {
+        IPage<ListingPageVO> page = listingService.getShopListings(sellerId, designFor, pageNum, pageSize);
+        return Response.success(PageResponse.success(page));
+    }
 }

src/main/java/com/aida/seller/module/listing/dto/ListingImageDTO.java

@@ -1,5 +1,7 @@
 package com.aida.seller.module.listing.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -15,10 +17,11 @@ public class ListingImageDTO implements Serializable {
 
     /** 图片ID，有值则更新，无则新增 */
     @Schema(description = "图片ID，有值则更新，无则新增")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 图片类别: cover/main_product/product/sketch/apparel */
-    @Schema(description = "图片类别: cover/main_product/product/sketch/apparel")
+    /** 图片类别: cover/cover_from/main_product/product/sketch/apparel/firstFrame/gif/video */
+    @Schema(description = "图片类别: cover/cover_from/main_product/product/sketch/apparel/firstFrame/gif/video")
     private String category;
 
     /** 图片URL */

src/main/java/com/aida/seller/module/listing/dto/ListingSaveDTO.java

@@ -1,5 +1,7 @@
 package com.aida.seller.module.listing.dto;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -17,6 +19,7 @@ public class ListingSaveDTO implements Serializable {
 
     /** 商品ID，无则新建，有则更新 */
     @Schema(description = "商品ID，无则新建，有则更新")
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 商品标题 */
@@ -31,9 +34,6 @@ public class ListingSaveDTO implements Serializable {
     @Schema(description = "价格")
     private BigDecimal price;
 
-    /** 库存 */
-    @Schema(description = "库存")
-    private Integer stock;
 
     /** 浏览量（更新时传入） */
     @Schema(description = "浏览量（更新时传入）")
@@ -51,7 +51,7 @@ public class ListingSaveDTO implements Serializable {
     @Schema(description = "适用性别: male/female")
     private String designFor;
 
-    /** 商品分类列表: outwear/trousers/blouse/dress/skirt/accessories */
-    @Schema(description = "商品分类列表: outwear/trousers/blouse/dress/skirt/accessories")
+    /** 商品分类列表: outwear/trousers/blouse/dress/skirt/others/tops/bottoms */
+    @Schema(description = "商品分类列表: outwear/trousers/blouse/dress/skirt/others/tops/bottoms")
     private List<String> productCategory;
 }

src/main/java/com/aida/seller/module/listing/dto/ListingStockDTO.java

@@ -1,23 +0,0 @@
-package com.aida.seller.module.listing.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * 批量库存更新 DTO
- */
-@Data
-public class ListingStockDTO implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /** 商品ID */
-    @Schema(description = "商品ID")
-    private Long id;
-
-    /** 库存值 */
-    @Schema(description = "库存值")
-    private Integer stock;
-}

src/main/java/com/aida/seller/module/listing/entity/ListingEntity.java

@@ -1,8 +1,9 @@
 package com.aida.seller.module.listing.entity;
 
-import com.aida.seller.module.listing.enums.ProductCategoryEnum;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -14,13 +15,14 @@ import java.util.List;
  * 商品实体
  */
 @Data
-@TableName("seller_listing")
+@TableName(value = "seller_listing", autoResultMap = true)
 public class ListingEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     /** 商品ID */
     @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 卖家ID */
@@ -35,8 +37,8 @@ public class ListingEntity implements Serializable {
     /** 价格 */
     private BigDecimal price;
 
-    /** 库存数量 */
-    private Integer stock;
+    /** 销量 */
+    private Integer salesVolume;
 
     /** 封面图URL（列表页展示用） */
     private String cover;
@@ -64,5 +66,5 @@ public class ListingEntity implements Serializable {
 
     /** 商品分类列表 */
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private List<ProductCategoryEnum> productCategory;
+    private List<String> productCategory;
 }

src/main/java/com/aida/seller/module/listing/entity/ListingImageEntity.java

@@ -1,6 +1,8 @@
 package com.aida.seller.module.listing.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,12 +19,14 @@ public class ListingImageEntity implements Serializable {
 
     /** 图片ID */
     @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 商品ID */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long listingId;
 
-    /** 图片类别: cover/main_product/product/sketch/apparel */
+    /** 图片类别: cover/cover_from/main_product/product/sketch/apparel/firstFrame/gif/video */
     private String category;
 
     /** 图片URL */
@@ -37,4 +41,8 @@ public class ListingImageEntity implements Serializable {
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
+
+    /** 是否删除：0-否，1-是 */
+    @TableLogic
+    private Integer deleted;
 }

src/main/java/com/aida/seller/module/listing/enums/DesignForEnum.java

@@ -11,7 +11,8 @@ import lombok.Getter;
 public enum DesignForEnum {
 
     MALE("male", "男性"),
-    FEMALE("female", "女性");
+    FEMALE("female", "女性"),
+    ALL("all", "全部");
 
     private final String code;
     private final String desc;

src/main/java/com/aida/seller/module/listing/enums/ImageCategoryEnum.java

@@ -14,7 +14,11 @@ public enum ImageCategoryEnum {
     MAIN_PRODUCT("main_product", "主产品图", false),
     PRODUCT("product", "产品图", true),
     SKETCH("sketch", "草图", false),
-    APPAREL("apparel", "成衣图", false);
+    COVERFROM("cover_from", "封面源", false),
+    APPAREL("apparel", "成衣图", false),
+    FIRST_FRAME("firstFrame", "首帧图", true),
+    GIF("gif", "GIF图", true),
+    VIDEO("video", "视频", true);
 
     private final String code;
     private final String desc;

src/main/java/com/aida/seller/module/listing/enums/ProductCategoryEnum.java

@@ -1,5 +1,7 @@
 package com.aida.seller.module.listing.enums;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -15,17 +17,21 @@ public enum ProductCategoryEnum {
     BLOUSE("blouse", "衬衫"),
     DRESS("dress", "连衣裙"),
     SKIRT("skirt", "半身裙"),
-    ACCESSORIES("accessories", "配饰");
+    OTHERS("others", "其他"),
+    TOP("tops", "上装"),
+    BOTTOMS("bottoms", "下装");
 
+    @JsonValue
     private final String code;
     private final String desc;
 
+    @JsonCreator
     public static ProductCategoryEnum of(String code) {
         if (code == null) {
             return null;
         }
         for (ProductCategoryEnum value : values()) {
-            if (value.code.equals(code)) {
+            if (value.code.equalsIgnoreCase(code)) {
                 return value;
             }
         }

src/main/java/com/aida/seller/module/listing/service/ListingService.java

@@ -2,12 +2,13 @@ package com.aida.seller.module.listing.service;
 
 import com.aida.seller.module.listing.dto.ListingQueryDTO;
 import com.aida.seller.module.listing.dto.ListingSaveDTO;
-import com.aida.seller.module.listing.dto.ListingStockDTO;
 import com.aida.seller.module.listing.entity.ListingEntity;
 import com.aida.seller.module.listing.vo.ListingPageVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * 商品 Service 接口
  */
@@ -21,6 +22,14 @@ public interface ListingService extends IService<ListingEntity> {
      */
     void saveOrUpdate(ListingSaveDTO dto, Long sellerId);
 
+    /**
+     * 批量保存或更新商品（含图片）
+     *
+     * @param dtoList  商品信息列表
+     * @param sellerId 卖家ID
+     */
+    void saveOrUpdate(List<ListingSaveDTO> dtoList, Long sellerId);
+
     /**
      * 获取商品详情（含所有图片）
      *
@@ -48,14 +57,6 @@ public interface ListingService extends IService<ListingEntity> {
      */
     void updateStatus(Long id, Integer status, Long sellerId);
 
-    /**
-     * 批量更新库存
-     *
-     * @param list     库存列表
-     * @param sellerId 卖家ID
-     */
-    void batchUpdateStock(java.util.List<ListingStockDTO> list, Long sellerId);
-
     /**
      * 设置弹窗提醒标志（7天过期）
      *
@@ -70,4 +71,16 @@ public interface ListingService extends IService<ListingEntity> {
      * @return true需要弹窗，false不需要
      */
     boolean checkPopupReminder(Long sellerId);
+
+    /**
+     * 获取店铺已发布商品列表，供买家端店铺主页调用
+     * <p>按 status=1、deleted=0、sellerId、designFor 筛选，按 updateTime 倒序</p>
+     *
+     * @param sellerId  设计师用户ID
+     * @param designFor 适用性别 female/male，all 表示不限制性别
+     * @param pageNum   页码
+     * @param pageSize  每页数量
+     * @return 分页商品列表
+     */
+    IPage<ListingPageVO> getShopListings(Long sellerId, String designFor, int pageNum, int pageSize);
 }

src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java

@@ -1,6 +1,7 @@
 package com.aida.seller.module.listing.service;
 
 import com.aida.seller.common.constants.CommonConstants;
+import com.aida.seller.common.context.UserContext;
 import com.aida.seller.common.exception.BusinessException;
 import com.aida.seller.module.listing.dto.*;
 import com.aida.seller.module.listing.entity.ListingEntity;
@@ -29,6 +30,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -45,17 +47,13 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveOrUpdate(ListingSaveDTO dto, Long sellerId) {
+        // 当 status 为 1（已发布）时，检查必填字段
+        validateListingFields(dto);
+
         ListingEntity entity = new ListingEntity();
         BeanUtils.copyProperties(dto, entity);
         entity.setSellerId(sellerId);
 
-        if (!CollectionUtils.isEmpty(dto.getProductCategory())) {
-            List<ProductCategoryEnum> categories = dto.getProductCategory().stream()
-                    .map(ProductCategoryEnum::of)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
-            entity.setProductCategory(categories.isEmpty() ? null : categories);
-        }
 
         if (dto.getDesignFor() != null && DesignForEnum.of(dto.getDesignFor()) == null) {
             throw new BusinessException("designFor 只能为 male/female");
@@ -67,14 +65,15 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
 
         Long listingId;
         if (dto.getId() == null) {
-            entity.setStatus(ListingStatusEnum.DRAFT.getCode());
+            entity.setStatus(dto.getStatus());
             this.save(entity);
             listingId = entity.getId();
         } else {
             ListingEntity existing = this.getOne(
                     new LambdaQueryWrapper<ListingEntity>()
                             .eq(ListingEntity::getId, dto.getId())
-                            .eq(ListingEntity::getSellerId, sellerId));
+                            .eq(ListingEntity::getSellerId, sellerId)
+                            .eq(ListingEntity::getDeleted, 0));
             if (existing == null) {
                 throw new BusinessException("商品不存在");
             }
@@ -86,6 +85,7 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
         }
 
         if (!CollectionUtils.isEmpty(dto.getImages())) {
+            validateImages(dto.getImages());
             handleImages(listingId, dto.getImages());
             String cover = extractCover(dto.getImages());
             if (StringUtils.hasText(cover)) {
@@ -97,12 +97,25 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveOrUpdate(List<ListingSaveDTO> dtoList, Long sellerId) {
+        if (CollectionUtils.isEmpty(dtoList)) {
+            return;
+        }
+
+        for (ListingSaveDTO dto : dtoList) {
+            saveOrUpdate(dto, sellerId);
+        }
+    }
+
     @Override
     public ListingSaveDTO getById(Long id, Long sellerId) {
         ListingEntity entity = this.getOne(
                 new LambdaQueryWrapper<ListingEntity>()
                         .eq(ListingEntity::getId, id)
-                        .eq(ListingEntity::getSellerId, sellerId));
+                        .eq(ListingEntity::getSellerId, sellerId)
+                        .eq(ListingEntity::getDeleted, 0));
         if (entity == null) {
             throw new BusinessException("商品不存在");
         }
@@ -110,13 +123,6 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
         ListingSaveDTO dto = new ListingSaveDTO();
         BeanUtils.copyProperties(entity, dto);
 
-        if (!CollectionUtils.isEmpty(entity.getProductCategory())) {
-            dto.setProductCategory(
-                    entity.getProductCategory().stream()
-                            .map(ProductCategoryEnum::getCode)
-                            .collect(Collectors.toList()));
-        }
-
         List<ListingImageEntity> images = listingImageMapper.selectList(
                 new LambdaQueryWrapper<ListingImageEntity>()
                         .eq(ListingImageEntity::getListingId, id)
@@ -125,7 +131,7 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
             List<ListingImageDTO> imageDTOs = images.stream().map(img -> {
                 ListingImageDTO imgDto = new ListingImageDTO();
                 BeanUtils.copyProperties(img, imgDto);
-                imgDto.setImageUrl(minioUtil.processMinioResource(imgDto.getImageUrl(),CommonConstants.MINIO_PATH_TIMEOUT));
+                imgDto.setImageUrl(minioUtil.processMinioResource(imgDto.getImageUrl(), CommonConstants.MINIO_PATH_TIMEOUT));
                 imgDto.setIsSelected(img.getIsSelected() != null && img.getIsSelected() == 1);
                 return imgDto;
             }).collect(Collectors.toList());
@@ -139,12 +145,13 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
         Page<ListingEntity> pageParam = new Page<>(dto.getPageNum(), dto.getPageSize());
         LambdaQueryWrapper<ListingEntity> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ListingEntity::getSellerId, sellerId);
+        queryWrapper.eq(ListingEntity::getDeleted, 0);
         if (dto.getStatus() != null) {
             queryWrapper.eq(ListingEntity::getStatus, dto.getStatus());
         } else {
             queryWrapper.ne(ListingEntity::getStatus, ListingStatusEnum.DELETED.getCode());
         }
-        queryWrapper.orderByDesc(ListingEntity::getCreateTime);
+        queryWrapper.orderByDesc(ListingEntity::getUpdateTime);
         IPage<ListingEntity> page = this.page(pageParam, queryWrapper);
 
         Page<ListingPageVO> result = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
@@ -162,7 +169,8 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
         ListingEntity existing = this.getOne(
                 new LambdaQueryWrapper<ListingEntity>()
                         .eq(ListingEntity::getId, id)
-                        .eq(ListingEntity::getSellerId, sellerId));
+                        .eq(ListingEntity::getSellerId, sellerId)
+                        .eq(ListingEntity::getDeleted, 0));
         if (existing == null) {
             throw new BusinessException("商品不存在");
         }
@@ -172,26 +180,6 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
         this.updateById(update);
     }
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void batchUpdateStock(List<ListingStockDTO> list, Long sellerId) {
-        if (CollectionUtils.isEmpty(list)) {
-            return;
-        }
-        List<Long> ids = list.stream().map(ListingStockDTO::getId).collect(Collectors.toList());
-        List<ListingEntity> existing = this.list(
-                new LambdaQueryWrapper<ListingEntity>()
-                        .eq(ListingEntity::getSellerId, sellerId)
-                        .in(ListingEntity::getId, ids));
-        if (existing.size() != ids.size()) {
-            throw new BusinessException("部分商品不存在或无权操作");
-        }
-        Map<Long, Integer> stockMap = list.stream()
-                .collect(Collectors.toMap(ListingStockDTO::getId, ListingStockDTO::getStock));
-        existing.forEach(e -> e.setStock(stockMap.get(e.getId())));
-        this.updateBatchById(existing);
-    }
-
     private void handleImages(Long listingId, List<ListingImageDTO> images) {
         Map<String, List<ListingImageDTO>> byCategory = images.stream()
                 .collect(Collectors.groupingBy(img -> img.getCategory() == null ? "" : img.getCategory()));
@@ -209,18 +197,49 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
 
             for (int i = 0; i < categoryImages.size(); i++) {
                 ListingImageDTO imgDto = categoryImages.get(i);
-                ListingImageEntity imgEntity = new ListingImageEntity();
-                imgEntity.setListingId(listingId);
-                imgEntity.setCategory(category);
-                imgEntity.setImageUrl(minioUtil.convertToLogicalPath(imgDto.getImageUrl()));
-                imgEntity.setSortOrder(imgDto.getSortOrder() != null ? imgDto.getSortOrder() : i);
+                if (imgDto.getImageUrl() != null && !imgDto.getImageUrl().isEmpty()) {
+                    ListingImageEntity imgEntity = new ListingImageEntity();
+                    imgEntity.setListingId(listingId);
+                    imgEntity.setCategory(category);
 
-                if (supportsSelection) {
-                    imgEntity.setIsSelected(Boolean.TRUE.equals(imgDto.getIsSelected()) ? 1 : 0);
-                } else {
-                    imgEntity.setIsSelected(0);
+                    imgEntity.setImageUrl(minioUtil.convertToLogicalPath(imgDto.getImageUrl()));
+                    imgEntity.setSortOrder(imgDto.getSortOrder() != null ? imgDto.getSortOrder() : i);
+
+                    if (supportsSelection) {
+                        imgEntity.setIsSelected(Boolean.TRUE.equals(imgDto.getIsSelected()) ? 1 : 0);
+                    } else {
+                        imgEntity.setIsSelected(0);
+                    }
+                    listingImageMapper.insert(imgEntity);
+                }
+            }
+        }
+    }
+
+    private void validateImages(List<ListingImageDTO> images) {
+        Set<String> requiredCategories = Set.of(
+                ImageCategoryEnum.COVER.getCode(),
+                ImageCategoryEnum.COVERFROM.getCode(),
+                ImageCategoryEnum.SKETCH.getCode(),
+                ImageCategoryEnum.APPAREL.getCode());
+
+        Set<String> presentCategories = images.stream()
+                .map(ListingImageDTO::getCategory)
+                .filter(StringUtils::hasText)
+                .collect(Collectors.toSet());
+
+        for (String category : requiredCategories) {
+            if (!presentCategories.contains(category)) {
+                throw new BusinessException("category [" + category + "] is required");
+            }
+        }
+
+        for (ListingImageDTO img : images) {
+            String category = img.getCategory();
+            if (requiredCategories.contains(category)) {
+                if (!StringUtils.hasText(img.getImageUrl())) {
+                    throw new BusinessException(category + " category imageUrl cannot be null or empty");
                 }
-                listingImageMapper.insert(imgEntity);
             }
         }
     }
@@ -234,12 +253,10 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
                 return img.getImageUrl();
             }
         }
-        if (!CollectionUtils.isEmpty(images)) {
-            return images.get(0).getImageUrl();
-        }
         return null;
     }
 
+
     @Override
     public void setPopupReminder(Long sellerId) {
         String key = "popup:reminder:" + sellerId;
@@ -252,4 +269,65 @@ public class ListingServiceImpl extends ServiceImpl<ListingMapper, ListingEntity
         Object value = redisTemplate.opsForValue().get(key);
         return value == null;
     }
+
+    /**
+     * 校验商品字段
+     * 当 status 为 1（已发布）时，检查必填字段
+     */
+    private void validateListingFields(ListingSaveDTO dto) {
+        if (!StringUtils.hasText(dto.getTitle())) {
+            throw new BusinessException("商品标题不能为空");
+        }
+        if (!StringUtils.hasText(dto.getDescription())) {
+            throw new BusinessException("商品描述不能为空");
+        }
+        if (dto.getPrice() == null) {
+            throw new BusinessException("商品价格不能为空");
+        }
+        if (!StringUtils.hasText(dto.getDesignFor())) {
+            throw new BusinessException("适用性别不能为空");
+        }
+        if (DesignForEnum.of(dto.getDesignFor()) == null) {
+            throw new BusinessException("适用性别只能为 male/female");
+        }
+        if (CollectionUtils.isEmpty(dto.getProductCategory())) {
+            throw new BusinessException("商品分类不能为空");
+        }
+        for (String category : dto.getProductCategory()) {
+            if (ProductCategoryEnum.of(category) == null) {
+                throw new BusinessException("商品分类只能为 outwear/trousers/blouse/dress/skirt/others/tops/bottoms");
+            }
+        }
+    }
+
+    @Override
+    public IPage<ListingPageVO> getShopListings(Long sellerId, String designFor, int pageNum, int pageSize) {
+        Page<ListingEntity> pageParam = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<ListingEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(ListingEntity::getSellerId, sellerId);
+        DesignForEnum designForEnum = DesignForEnum.of(designFor);
+        if (designForEnum == null) {
+            throw new BusinessException("designFor 只能为 female/male/all");
+        }
+        if (designForEnum != DesignForEnum.ALL) {
+            queryWrapper.eq(ListingEntity::getDesignFor, designForEnum.getCode());
+        }
+        queryWrapper.eq(ListingEntity::getStatus, 1);
+        queryWrapper.eq(ListingEntity::getDeleted, 0);
+        queryWrapper.orderByDesc(ListingEntity::getUpdateTime);
+        IPage<ListingEntity> page = this.page(pageParam, queryWrapper);
+
+        Page<ListingPageVO> result = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        boolean loggedIn = UserContext.getUserId() != null;
+        result.setRecords(page.getRecords().stream().map(entity -> {
+            ListingPageVO vo = new ListingPageVO();
+            BeanUtils.copyProperties(entity, vo);
+            vo.setCover(minioUtil.processMinioResource(vo.getCover(), CommonConstants.MINIO_PATH_TIMEOUT));
+            if (!loggedIn) {
+                vo.setPrice(null);
+            }
+            return vo;
+        }).collect(Collectors.toList()));
+        return result;
+    }
 }

src/main/java/com/aida/seller/module/listing/vo/ListingPageVO.java

@@ -1,5 +1,7 @@
 package com.aida.seller.module.listing.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -15,6 +17,7 @@ public class ListingPageVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /** 商品ID */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
     /** 封面图URL（列表页直返，无须关联图片表） */
@@ -26,15 +29,6 @@ public class ListingPageVO implements Serializable {
     /** 价格 */
     private BigDecimal price;
 
-    /** 库存 */
-    private Integer stock;
-
-    /** 浏览量 */
-    private Integer viewCount;
-
-    /** 状态 */
-    private Integer status;
-
-    /** 创建时间（用于排序） */
-    private LocalDateTime createTime;
+    /** 修改时间 */
+    private LocalDateTime updateTime;
 }

src/main/java/com/aida/seller/module/order/entity/OrderInfoEntity.java

@@ -1,6 +1,8 @@
 package com.aida.seller.module.order.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,11 +19,9 @@ public class OrderInfoEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 订单唯一标识（如 SP897772698） */
-    private String orderId;
-
     /** 卖家ID */
     private Long sellerId;
 
@@ -37,7 +37,8 @@ public class OrderInfoEntity implements Serializable {
     /** 总浏览量 */
     private Long totalViews;
 
-    /** 下单时间 */
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
     /** 更新时间 */

src/main/java/com/aida/seller/module/order/entity/OrderItemEntity.java

@@ -1,6 +1,8 @@
 package com.aida.seller.module.order.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -18,13 +20,16 @@ public class OrderItemEntity implements Serializable {
 
     /** 主键ID */
     @TableId(type = IdType.ASSIGN_ID)
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
-    /** 订单ID（关联 order_info） */
-    private String orderId;
+    /** 订单ID（关联 seller_orders） */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orderId;
 
     /** 商品ID */
-    private Long productId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long listingId;
 
     /** 商品名称 */
     private String productName;
@@ -35,9 +40,6 @@ public class OrderItemEntity implements Serializable {
     /** 成交单价（HK$） */
     private BigDecimal price;
 
-    /** 购买数量 */
-    private Integer quantity;
-
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;

src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java

@@ -75,10 +75,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         if (StringUtils.hasText(dto.getKeyword())) {
             String keyword = dto.getKeyword().trim();
             queryWrapper.and(w -> w
-                    .like(OrderInfoEntity::getOrderId, keyword)
+                    .like(OrderInfoEntity::getId, keyword)
                     .or()
-                    .inSql(OrderInfoEntity::getOrderId,
-                            "SELECT order_id FROM order_item WHERE product_name LIKE '%" + keyword + "%'")
+                    .inSql(OrderInfoEntity::getId,
+                            "SELECT order_id FROM seller_order_item WHERE deleted = 0 AND product_name LIKE '%" + keyword + "%'")
             );
         }
 
@@ -86,11 +86,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
 
         Page<OrderInfoEntity> page = this.page(pageParam, queryWrapper);
 
-        List<String> orderIds = page.getRecords().stream()
-                .map(OrderInfoEntity::getOrderId)
+        List<Long> orderIds = page.getRecords().stream()
+                .map(OrderInfoEntity::getId)
                 .collect(Collectors.toList());
 
-        Map<String, List<OrderItemEntity>> itemsMap = orderIds.isEmpty()
+        Map<Long, List<OrderItemEntity>> itemsMap = orderIds.isEmpty()
                 ? Collections.emptyMap()
                 : orderItemMapper.selectList(
                         new LambdaQueryWrapper<OrderItemEntity>()
@@ -100,15 +100,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
 
         List<OrderVO> voList = page.getRecords().stream().map(order -> {
             OrderVO vo = new OrderVO();
-            vo.setOrderId(order.getOrderId());
+            vo.setOrderId(order.getId());
             vo.setPrice(order.getTotalPrice());
             vo.setBuyerUsername("@" + (order.getBuyerUsername() != null ? order.getBuyerUsername() : ""));
             vo.setDate(order.getCreateTime());
 
-            List<OrderItemEntity> items = itemsMap.getOrDefault(order.getOrderId(), new ArrayList<>());
+            List<OrderItemEntity> items = itemsMap.getOrDefault(order.getId(), new ArrayList<>());
             List<OrderVO.ItemVO> itemVOs = items.stream().map(item -> {
                 OrderVO.ItemVO itemVO = new OrderVO.ItemVO();
-                itemVO.setProductId(item.getProductId());
+                itemVO.setProductId(item.getListingId());
                 itemVO.setProductName(item.getProductName());
                 itemVO.setThumbnailUrl(minioUtil.processMinioResource(item.getThumbnailUrl(), CommonConstants.MINIO_PATH_TIMEOUT));
                 return itemVO;

src/main/java/com/aida/seller/module/order/vo/OrderVO.java

@@ -1,5 +1,7 @@
 package com.aida.seller.module.order.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -14,8 +16,9 @@ public class OrderVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Schema(description = "订单唯一标识", example = "SP897772698")
-    private String orderId;
+    @Schema(description = "订单唯一标识")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long orderId;
 
     @Schema(description = "商品明细列表")
     private List<ItemVO> items;
@@ -36,6 +39,7 @@ public class OrderVO implements Serializable {
         private static final long serialVersionUID = 1L;
 
         @Schema(description = "商品ID")
+        @JsonSerialize(using = ToStringSerializer.class)
         private Long productId;
 
         @Schema(description = "商品名")

src/main/resources/application.yml

@@ -5,7 +5,7 @@
 # ============================================================
 
 server:
-  port: 5568
+  port: 10093
 
 spring:
   application:
@@ -17,7 +17,7 @@ mybatis-plus:
   type-aliases-package: com.aida.seller.module.*.entity
   global-config:
     db-config:
-      id-type: auto
+      id-type: assign_id
       logic-delete-field: deleted
       logic-delete-value: 1
       logic-not-delete-value: 0
@@ -30,5 +30,3 @@ minio:
   default-bucket: aida-user
 
 logging:
-  level:
-    com.aida: debug

src/main/resources/bootstrap.yml

@@ -4,21 +4,32 @@
 # 示例：docker run -e NACOS_NAMESPACE=prod ...
 # ============================================================
 
+nacos:
+  namespace: dev
+  host: 18.167.251.121:28848
+  username: nacos
+  password: Aidlab123123!
+
 spring:
   application:
     name: aida-seller
   config:
-    import: optional:nacos:aida-public-${NACOS_NAMESPACE:test}.yml
+    import: optional:nacos:aida-public-${nacos.namespace}.yml
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:18.167.251.121:28848}
-        namespace: ${NACOS_NAMESPACE:ltx}
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:Aidlab123123!}
+        server-addr: ${nacos.host}
+        namespace: ${nacos.namespace}
+        username: ${nacos.username}
+        password: ${nacos.password}
+#        ip: 18.167.251.121
+        port: 10093
+#        ip-type: ipv4
+#        prefer-ip-address: true
+
       config:
-        server-addr: ${NACOS_HOST:18.167.251.121:28848}
-        namespace: ${NACOS_NAMESPACE:ltx}
+        server-addr: ${nacos.host}
+        namespace: ${nacos.namespace}
         file-extension: yaml
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:Aidlab123123!}
+        username: ${nacos.username}
+        password: ${nacos.password}

src/main/resources/db/schema.sql

@@ -28,7 +28,9 @@ CREATE TABLE seller_listing_image (
     sort_order      INT DEFAULT 0 COMMENT '排序',
     is_selected     INT(1) DEFAULT 0 COMMENT '是否选中: 0-未选中, 1-选中(仅product有效)',
     create_time     DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-    INDEX idx_listing_id (listing_id)
+    deleted         INT(1) DEFAULT 0 COMMENT '是否删除：0-否，1-是',
+    INDEX idx_listing_id (listing_id),
+    INDEX idx_deleted (deleted)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='商品图片表';
 
 -- 设计师表
@@ -59,7 +61,6 @@ CREATE TABLE seller_designer (
 -- 订单主表
 CREATE TABLE seller_orders (
     id              BIGINT PRIMARY KEY COMMENT '主键ID',
-    order_id        VARCHAR(50) NOT NULL COMMENT '订单唯一标识（如 SP897772698）',
     seller_id       BIGINT NOT NULL COMMENT '卖家ID',
     total_price     DECIMAL(10,2) COMMENT '订单总金额(HK$)',
     buyer_username  VARCHAR(100) COMMENT '买家账号',
@@ -68,7 +69,6 @@ CREATE TABLE seller_orders (
     create_time     DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '下单时间',
     update_time     DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
     deleted         INT(1) DEFAULT 0 COMMENT '是否删除：0-否，1-是',
-    INDEX idx_order_id (order_id),
     INDEX idx_seller_id (seller_id),
     INDEX idx_deleted (deleted),
     INDEX idx_create_time (create_time)
@@ -78,14 +78,13 @@ CREATE TABLE seller_orders (
 CREATE TABLE seller_order_item (
     id              BIGINT PRIMARY KEY COMMENT '主键ID',
     order_id        VARCHAR(50) NOT NULL COMMENT '订单ID',
-    product_id      BIGINT NOT NULL COMMENT '商品ID',
+    listing_id      BIGINT NOT NULL COMMENT '商品ID',
     product_name    VARCHAR(255) COMMENT '商品名称',
     thumbnail_url   VARCHAR(200) COMMENT '商品缩略图URL',
     price           DECIMAL(10,2) COMMENT '成交单价(HK$)',
-    quantity        INT NOT NULL COMMENT '购买数量',
     create_time     DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     deleted         INT(1) DEFAULT 0 COMMENT '是否删除：0-否，1-是',
     INDEX idx_order_id (order_id),
-    INDEX idx_product_id (product_id),
+    INDEX idx_listing_id (listing_id),
     INDEX idx_deleted (deleted)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订单商品明细表';

src/main/resources/logback-spring.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
+
+    <!-- 日志存放路径 -->
+    <property name="log.path" value="./log" />
+    <!-- 日志输出格式 -->
+    <property name="log.pattern.console" value="${CONSOLE_LOG_PATTERN:-%clr(%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <property name="log.pattern.file" value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%15t] %-40.40logger{39} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.pattern.console}</pattern>
+        </encoder>
+    </appender>
+
+    <!-- Info 日志文件 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/aida-seller-info.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/aida-seller-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern.file}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- Error 日志文件 -->
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/aida-seller-error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/aida-seller-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern.file}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 服务模块日志级别控制 -->
+    <logger name="com.aida" level="debug" />
+    <logger name="com.aida.seller.mapper" level="info" />
+    <!-- Spring 日志级别控制 -->
+    <logger name="org.springframework" level="warn" />
+
+    <root level="info">
+        <appender-ref ref="console" />
+    </root>
+
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+
+</configuration>