From 552be0036b1af4b3217281ea70cacc54a1c2e68b Mon Sep 17 00:00:00 2001 From: litianxiang Date: Wed, 3 Jun 2026 17:23:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=96=E5=AE=B6=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exception/GlobalExceptionHandler.java | 2 +- .../controller/DesignerController.java | 7 ++++--- .../designer/entity/DesignerEntity.java | 3 +++ .../designer/service/DesignerService.java | 3 ++- .../designer/service/DesignerServiceImpl.java | 21 +++++++++++++------ 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/aida/seller/common/exception/GlobalExceptionHandler.java b/src/main/java/com/aida/seller/common/exception/GlobalExceptionHandler.java index 3cafd98..3920cee 100644 --- a/src/main/java/com/aida/seller/common/exception/GlobalExceptionHandler.java +++ b/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异常 diff --git a/src/main/java/com/aida/seller/module/designer/controller/DesignerController.java b/src/main/java/com/aida/seller/module/designer/controller/DesignerController.java index 9b5ed88..b824a17 100644 --- a/src/main/java/com/aida/seller/module/designer/controller/DesignerController.java +++ b/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 check() { + public Response 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 = "设计师提交入驻申请，系统自动设置为待审核状态") diff --git a/src/main/java/com/aida/seller/module/designer/entity/DesignerEntity.java b/src/main/java/com/aida/seller/module/designer/entity/DesignerEntity.java index 3edbfa5..d6e9090 100644 --- a/src/main/java/com/aida/seller/module/designer/entity/DesignerEntity.java +++ b/src/main/java/com/aida/seller/module/designer/entity/DesignerEntity.java @@ -59,6 +59,9 @@ public class DesignerEntity implements Serializable { /** 状态: 0-禁用, 1-启用 */ private Integer status; + + /** 是否首次进入卖家系统: 0-否, 1-是 */ + private Integer firstEnter; /** 创建时间 */ @TableField(fill = FieldFill.INSERT) diff --git a/src/main/java/com/aida/seller/module/designer/service/DesignerService.java b/src/main/java/com/aida/seller/module/designer/service/DesignerService.java index 445cdab..e2cc7c6 100644 --- a/src/main/java/com/aida/seller/module/designer/service/DesignerService.java +++ b/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 { /** * 检查设计师是否有售卖资格 */ - Boolean checkQualification(Long userId); + DesignerCheckVO checkQualification(Long userId); /** * 提交设计师入驻申请 diff --git a/src/main/java/com/aida/seller/module/designer/service/DesignerServiceImpl.java b/src/main/java/com/aida/seller/module/designer/service/DesignerServiceImpl.java index f1cf8bc..4f8657d 100644 --- a/src/main/java/com/aida/seller/module/designer/service/DesignerServiceImpl.java +++ b/src/main/java/com/aida/seller/module/designer/service/DesignerServiceImpl.java @@ -9,6 +9,7 @@ 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.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; @@ -46,19 +47,22 @@ public class DesignerServiceImpl extends ServiceImpl() .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 @@ -240,6 +244,11 @@ public class DesignerServiceImpl extends ServiceImpl Date: Wed, 3 Jun 2026 17:25:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=96=E5=AE=B6=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/designer/vo/DesignerCheckVO.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/com/aida/seller/module/designer/vo/DesignerCheckVO.java diff --git a/src/main/java/com/aida/seller/module/designer/vo/DesignerCheckVO.java b/src/main/java/com/aida/seller/module/designer/vo/DesignerCheckVO.java new file mode 100644 index 0000000..04f894b --- /dev/null +++ b/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; +} From 4beff1d870bf6d7fb9377fe4d5efef7e99caa2c9 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Wed, 3 Jun 2026 17:50:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=B2=E8=B4=AD=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/aida/seller/module/order/service/OrderServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java b/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java index bb57394..cdef926 100644 --- a/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java +++ b/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java @@ -415,6 +415,7 @@ public class OrderServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(OrderItemEntity::getBuyerId, buyerId) + .eq(OrderItemEntity::getStatus, 1) .in(OrderItemEntity::getListingId, listingIds); return orderItemMapper.selectList(wrapper).stream() .map(OrderItemEntity::getListingId)