Merge remote-tracking branch 'origin/master'

src/main/java/com/aida/seller/common/exception/GlobalExceptionHandler.java

@@ -54,7 +54,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(Exception.class)
     public Response<?> handleException(Exception e) {
         log.error("系统异常: ", e);
-        return Response.error(e.getMessage());
+        return Response.error("system error");
     }
     /**
      * 处理MinIO异常

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

@@ -10,6 +10,7 @@ import com.aida.seller.module.designer.entity.DesignerEntity;
 import com.aida.seller.module.designer.enums.DesignerApplyStatusEnum;
 import com.aida.seller.module.designer.service.DesignerService;
 import com.aida.seller.module.designer.vo.DesignerSearchVO;
+import com.aida.seller.module.designer.vo.DesignerCheckVO;
 import com.aida.seller.module.designer.vo.DesignerShopVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -29,10 +30,10 @@ public class DesignerController {
 
     @Operation(summary = "查询设计师是否有售卖资格")
     @GetMapping("/check")
-    public Response<Boolean> check() {
+    public Response<DesignerCheckVO> check() {
         Long userId = UserContext.getUserId();
-        boolean hasQualification = designerService.checkQualification(userId);
-        return Response.success(hasQualification);
+        DesignerCheckVO checkResult = designerService.checkQualification(userId);
+        return Response.success(checkResult);
     }
 
     @Operation(summary = "提交设计师入驻申请", description = "设计师提交入驻申请，系统自动设置为待审核状态")

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

@@ -60,6 +60,9 @@ public class DesignerEntity implements Serializable {
     /** 状态: 0-禁用, 1-启用 */
     private Integer status;
 
+    /** 是否首次进入卖家系统: 0-否, 1-是 */
+    private Integer firstEnter;
+    
     /** 创建时间 */
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;

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

@@ -4,6 +4,7 @@ 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.DesignerCheckVO;
 import com.aida.seller.module.designer.vo.DesignerSearchVO;
 import com.aida.seller.module.designer.vo.DesignerShopVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -16,7 +17,7 @@ public interface DesignerService extends IService<DesignerEntity> {
     /**
      * 检查设计师是否有售卖资格
      */
-    Boolean checkQualification(Long userId);
+    DesignerCheckVO checkQualification(Long userId);
 
     /**
      * 提交设计师入驻申请

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

@@ -10,6 +10,7 @@ import com.aida.seller.module.designer.entity.DesignerEntity;
 import com.aida.seller.module.designer.enums.DesignerApplyStatusEnum;
 import com.aida.seller.module.designer.feign.AiDABackFeignClient;
 import com.aida.seller.module.designer.mapper.DesignerMapper;
+import com.aida.seller.module.designer.vo.DesignerCheckVO;
 import com.aida.seller.module.designer.vo.DesignerSearchVO;
 import com.aida.seller.module.designer.vo.DesignerShopVO;
 import com.aida.seller.module.listing.entity.ListingEntity;
@@ -48,19 +49,22 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
     private final AiDABackFeignClient aidaBackFeignClient;
 
     @Override
-    public Boolean checkQualification(Long userId) {
+    public DesignerCheckVO checkQualification(Long userId) {
         DesignerEntity entity = this.getOne(
             new LambdaQueryWrapper<DesignerEntity>()
                 .eq(DesignerEntity::getUserId, userId)
                 .last("LIMIT 1")
         );
 
-        if (entity == null) {
-            return false;
-        }
-
-        return DesignerApplyStatusEnum.APPROVED.getCode().equals(entity.getApplyStatus())
+        boolean hasQualification = entity != null
+               && DesignerApplyStatusEnum.APPROVED.getCode().equals(entity.getApplyStatus())
                && entity.getStatus() != null && entity.getStatus() == 1;
+
+        DesignerCheckVO vo = new DesignerCheckVO();
+        vo.setHasQualification(hasQualification);
+        vo.setFirstEnter(entity != null ? entity.getFirstEnter() : null);
+
+        return vo;
     }
 
     @Override
@@ -246,6 +250,11 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
         dto.setSocialLinks(entity.getSocialLinks());
         dto.setDescription(entity.getDescription());
 
+        if (entity.getFirstEnter() == null || entity.getFirstEnter() == 0) {
+            entity.setFirstEnter(1);
+            this.updateById(entity);
+        }
+
         return dto;
     }
 

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

@@ -0,0 +1,22 @@
+package com.aida.seller.module.designer.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 设计师售卖资格检查结果VO
+ */
+@Data
+@Schema(description = "设计师售卖资格检查结果")
+public class DesignerCheckVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "是否有售卖资格")
+    private Boolean hasQualification;
+
+    @Schema(description = "是否首次进入卖家系统: 0-否, 1-是")
+    private Integer firstEnter;
+}

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

@@ -415,6 +415,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
         }
         LambdaQueryWrapper<OrderItemEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrderItemEntity::getBuyerId, buyerId)
+                .eq(OrderItemEntity::getStatus, 1)
                .in(OrderItemEntity::getListingId, listingIds);
         return orderItemMapper.selectList(wrapper).stream()
                 .map(OrderItemEntity::getListingId)