卖家红点
This commit is contained in:
@@ -54,7 +54,7 @@ public class GlobalExceptionHandler {
|
|||||||
@ExceptionHandler(Exception.class)
|
@ExceptionHandler(Exception.class)
|
||||||
public Response<?> handleException(Exception e) {
|
public Response<?> handleException(Exception e) {
|
||||||
log.error("系统异常: ", e);
|
log.error("系统异常: ", e);
|
||||||
return Response.error(e.getMessage());
|
return Response.error("system error");
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 处理MinIO异常
|
* 处理MinIO异常
|
||||||
|
|||||||
@@ -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.enums.DesignerApplyStatusEnum;
|
||||||
import com.aida.seller.module.designer.service.DesignerService;
|
import com.aida.seller.module.designer.service.DesignerService;
|
||||||
import com.aida.seller.module.designer.vo.DesignerSearchVO;
|
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 com.aida.seller.module.designer.vo.DesignerShopVO;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.Parameter;
|
import io.swagger.v3.oas.annotations.Parameter;
|
||||||
@@ -29,10 +30,10 @@ public class DesignerController {
|
|||||||
|
|
||||||
@Operation(summary = "查询设计师是否有售卖资格")
|
@Operation(summary = "查询设计师是否有售卖资格")
|
||||||
@GetMapping("/check")
|
@GetMapping("/check")
|
||||||
public Response<Boolean> check() {
|
public Response<DesignerCheckVO> check() {
|
||||||
Long userId = UserContext.getUserId();
|
Long userId = UserContext.getUserId();
|
||||||
boolean hasQualification = designerService.checkQualification(userId);
|
DesignerCheckVO checkResult = designerService.checkQualification(userId);
|
||||||
return Response.success(hasQualification);
|
return Response.success(checkResult);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Operation(summary = "提交设计师入驻申请", description = "设计师提交入驻申请,系统自动设置为待审核状态")
|
@Operation(summary = "提交设计师入驻申请", description = "设计师提交入驻申请,系统自动设置为待审核状态")
|
||||||
|
|||||||
@@ -59,6 +59,9 @@ public class DesignerEntity implements Serializable {
|
|||||||
|
|
||||||
/** 状态: 0-禁用, 1-启用 */
|
/** 状态: 0-禁用, 1-启用 */
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
|
/** 是否首次进入卖家系统: 0-否, 1-是 */
|
||||||
|
private Integer firstEnter;
|
||||||
|
|
||||||
/** 创建时间 */
|
/** 创建时间 */
|
||||||
@TableField(fill = FieldFill.INSERT)
|
@TableField(fill = FieldFill.INSERT)
|
||||||
|
|||||||
@@ -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.DesignerAuditDTO;
|
||||||
import com.aida.seller.module.designer.dto.DesignerDTO;
|
import com.aida.seller.module.designer.dto.DesignerDTO;
|
||||||
import com.aida.seller.module.designer.entity.DesignerEntity;
|
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.DesignerSearchVO;
|
||||||
import com.aida.seller.module.designer.vo.DesignerShopVO;
|
import com.aida.seller.module.designer.vo.DesignerShopVO;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
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);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提交设计师入驻申请
|
* 提交设计师入驻申请
|
||||||
|
|||||||
@@ -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.entity.DesignerEntity;
|
||||||
import com.aida.seller.module.designer.enums.DesignerApplyStatusEnum;
|
import com.aida.seller.module.designer.enums.DesignerApplyStatusEnum;
|
||||||
import com.aida.seller.module.designer.mapper.DesignerMapper;
|
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.DesignerSearchVO;
|
||||||
import com.aida.seller.module.designer.vo.DesignerShopVO;
|
import com.aida.seller.module.designer.vo.DesignerShopVO;
|
||||||
import com.aida.seller.module.listing.entity.ListingEntity;
|
import com.aida.seller.module.listing.entity.ListingEntity;
|
||||||
@@ -46,19 +47,22 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
|
|||||||
private final ListingImageMapper listingImageMapper;
|
private final ListingImageMapper listingImageMapper;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean checkQualification(Long userId) {
|
public DesignerCheckVO checkQualification(Long userId) {
|
||||||
DesignerEntity entity = this.getOne(
|
DesignerEntity entity = this.getOne(
|
||||||
new LambdaQueryWrapper<DesignerEntity>()
|
new LambdaQueryWrapper<DesignerEntity>()
|
||||||
.eq(DesignerEntity::getUserId, userId)
|
.eq(DesignerEntity::getUserId, userId)
|
||||||
.last("LIMIT 1")
|
.last("LIMIT 1")
|
||||||
);
|
);
|
||||||
|
|
||||||
if (entity == null) {
|
boolean hasQualification = entity != null
|
||||||
return false;
|
&& DesignerApplyStatusEnum.APPROVED.getCode().equals(entity.getApplyStatus())
|
||||||
}
|
|
||||||
|
|
||||||
return DesignerApplyStatusEnum.APPROVED.getCode().equals(entity.getApplyStatus())
|
|
||||||
&& entity.getStatus() != null && entity.getStatus() == 1;
|
&& entity.getStatus() != null && entity.getStatus() == 1;
|
||||||
|
|
||||||
|
DesignerCheckVO vo = new DesignerCheckVO();
|
||||||
|
vo.setHasQualification(hasQualification);
|
||||||
|
vo.setFirstEnter(entity != null ? entity.getFirstEnter() : null);
|
||||||
|
|
||||||
|
return vo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -240,6 +244,11 @@ public class DesignerServiceImpl extends ServiceImpl<DesignerMapper, DesignerEnt
|
|||||||
dto.setSocialLinks(entity.getSocialLinks());
|
dto.setSocialLinks(entity.getSocialLinks());
|
||||||
dto.setDescription(entity.getDescription());
|
dto.setDescription(entity.getDescription());
|
||||||
|
|
||||||
|
if (entity.getFirstEnter() == null || entity.getFirstEnter() == 0) {
|
||||||
|
entity.setFirstEnter(1);
|
||||||
|
this.updateById(entity);
|
||||||
|
}
|
||||||
|
|
||||||
return dto;
|
return dto;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user