From aea39e1d77120c48f740dc8bb80f7e8c7321e6db Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 06 一月 2025 18:13:05 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java b/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
index bd004a3..db686e7 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
@@ -12,6 +12,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -34,7 +35,7 @@
@ApiOperation(value = "验光师列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOptometristVO>> pageList(@RequestBody TOptometristQuery query) {
- PageInfo<TOptometristVO> optometristVOPageInfo = optometristService.pageList(query);
+ PageInfo<TOptometristVO> optometristVOPageInfo = optometristService.pageList1(query);
return ApiResult.success(optometristVOPageInfo);
}
@@ -45,10 +46,22 @@
.eq(TOptometrist::getStoreId,storeId));
return ApiResult.success(optometristVOPageInfo);
}
-
+ @ApiOperation(value = "验光师详情")
+ @GetMapping(value = "/detail")
+ public ApiResult<TOptometrist> detail(Integer id) {
+ return ApiResult.success(optometristService.getById(id));
+ }
@ApiOperation(value = "验光师添加")
@PostMapping(value = "/add")
public ApiResult<String> add(@RequestBody TOptometrist dto) {
+ if (StringUtils.hasLength(dto.getName())&&dto.getName().length()>15){
+ return ApiResult.failed("验光师名称不能超过15个字");
+ }
+ TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone())
+ .eq(TOptometrist::getStatus, 1).one();
+ if (one!=null){
+ return ApiResult.failed("当前号码已存在");
+ }
optometristService.save(dto);
return ApiResult.success();
}
@@ -56,14 +69,32 @@
@ApiOperation(value = "验光师编辑")
@PostMapping(value = "/update")
public ApiResult<String> update(@RequestBody TOptometrist dto) {
+ if (StringUtils.hasLength(dto.getName())&&dto.getName().length()>15){
+ return ApiResult.failed("验光师名称不能超过15个字");
+ }
+
+ TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone())
+ .ne(TOptometrist::getId,dto.getId())
+ .eq(TOptometrist::getStatus, 1).one();
+ if (one!=null){
+ return ApiResult.failed("当前号码已存在");
+ }
optometristService.updateById(dto);
return ApiResult.success();
}
@ApiOperation(value = "验光师上下架")
@GetMapping(value = "/upAndDown")
- public ApiResult<Boolean> upAndDown(@RequestParam Integer id,
+ public ApiResult upAndDown(@RequestParam Integer id,
@RequestParam Integer status) {
+ TOptometrist optometrist = optometristService.getById(id);
+ if (status==1){
+ // 启用之前 先查询有没有手机号相同的验光师正在启用状态
+ TOptometrist oldOptometrist = optometristService.lambdaQuery().eq(TOptometrist::getPhone, optometrist.getPhone()).eq(TOptometrist::getStatus, 1).one();
+ if (oldOptometrist!=null){
+ return ApiResult.failed("当前手机号正在使用");
+ }
+ }
return ApiResult.success(optometristService.upAndDown(id,status));
}
}
--
Gitblit v1.7.1