From 3d030135785eb40a098085e46a5252c17dffa9a3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 16:56:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
index 2ff265e..df87c99 100644
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
+++ b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -69,16 +69,44 @@
PageInfo<TOptometryVO> tOptometryVOPageInfo = optometristService.pageList(query);
return ApiResult.success(tOptometryVOPageInfo);
}
+ @ApiOperation(value = "验光记录详情")
+ @GetMapping(value = "/detail")
+ public ApiResult<TDetailVO> detail(Integer id) {
+ TOptometry one = optometryService.getById(id);
+ TAppUser byId = appUserService.getById(one.getUserId());
+ TDetailVO tDetailVO = new TDetailVO();
+ tDetailVO.setName(byId.getName());
+ tDetailVO.setPhone(byId.getPhone());
+ tDetailVO.setAvatar(byId.getAvatar());
+ tDetailVO.setRealName(one.getRealName());
+ tDetailVO.setAge(one.getAge());
+ tDetailVO.setGender(one.getGender());
+ // 查询消费次数，验光次数
+ long l = optometryService.count(Wrappers.<TOptometry>lambdaQuery()
+ .eq(TOptometry::getUserId, byId.getId())
+ .eq(TOptometry::getStatus,3));
+ tDetailVO.setOptometryCount((int) l);
+ long count = orderService.count(Wrappers.<TOrder>lambdaQuery()
+ .eq(TOrder::getUserId, byId.getId()));
+ tDetailVO.setSaleCount((int) count);
+ TOptometrist byId1 = optometristService.getById(one.getOptometristId());
+ tDetailVO.setOptometristName(byId1.getName());
+ TStore byId2 = storeService.getById(one.getStoreId());
+ tDetailVO.setStoreName(byId2.getName());
+ List<TOptometryDetail> list = optometryDetailService.lambdaQuery().eq(TOptometryDetail::getOptometryId, one.getId()).list();
+ tDetailVO.setOptometryDetailVOS(list);
+ tDetailVO.setCreateTime(one.getCreateTime());
+ return ApiResult.success(tDetailVO);
+ }
@ApiOperation(value = "首页")
@PostMapping(value = "/index")
public ApiResult<TOptometristVO> index() {
TOptometristVO tOptometristVO = new TOptometristVO();
-
- Long userId = loginInfoUtil.getUserId();
- SecUser byId = secUserService.getById(userId);
+ Integer userId = loginInfoUtil.getUserId();
+ TOptometrist byId = optometristService.getById(userId);
TStore byId1 = storeService.getById(byId.getStoreId());
tOptometristVO.setStoreName(byId1.getName());
- tOptometristVO.setName(byId.getNickName());
+ tOptometristVO.setName(byId.getName());
tOptometristVO.setPhone(byId.getPhone());
int size = optometryService.lambdaQuery().eq(TOptometry::getOptometristId, userId)
.eq(TOptometry::getStatus, 3).list().size();
@@ -134,7 +162,7 @@
@ApiOperation(value = "开始验光")
@GetMapping(value = "/startOptometry")
public ApiResult startOptometry(Integer id) {
- Long userId = loginInfoUtil.getUserId();
+ Integer userId = loginInfoUtil.getUserId();
List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStatus, 2)
.eq(TLineUp::getOptometristId, userId).list();
if (!list.isEmpty())return ApiResult.failed("当前还有未结束的验光单");
@@ -143,12 +171,18 @@
tLineUpService.updateById(lineUp);
return ApiResult.success();
}
+
@ApiOperation(value = "取消排号")
@GetMapping(value = "/cancelLineUp")
public ApiResult cancelLineUp(Integer id) {
TLineUp lineUp = tLineUpService.getById(id);
lineUp.setStatus(5);
tLineUpService.updateById(lineUp);
+ TOptometry one = optometryService.lambdaQuery().eq(TOptometry::getLineUpId, lineUp.getId()).one();
+ if (one!=null){
+ one.setStatus(5);
+ }
+ optometryService.updateById(one);
return ApiResult.success();
}
@ApiOperation(value = "填写验光信息完成")
@@ -163,11 +197,14 @@
if (byId1!=null){
tOptometry.setPhone(byId1.getPhone());
}
- Long userId = loginInfoUtil.getUserId();
- SecUser byId2 = secUserService.getById(userId);
+ tOptometry.setLineUpId(dto.getId());
+ Integer userId = loginInfoUtil.getUserId();
+ TOptometrist byId2 = optometristService.getById(userId);
tOptometry.setRealName(byId.getUserName());
- tOptometry.setOptometristId(userId.intValue());
+ tOptometry.setLineUpId(dto.getId());
+ tOptometry.setOptometristId(userId);
tOptometry.setStoreId(byId2.getStoreId());
+ tOptometry.setStatus(3);
optometryService.save(tOptometry);
List<TOptometryDetail> tOptometryDetails = new ArrayList<>();
@@ -178,7 +215,7 @@
tOptometryDetail.setBallMirror(optometryDetailVO.getBallMirror());
tOptometryDetail.setColumnMirror(optometryDetailVO.getColumnMirror());
tOptometryDetail.setAxis(optometryDetailVO.getAxis());
- tOptometryDetail.setAdd(optometryDetailVO.getAdd());
+ tOptometryDetail.setAddS(optometryDetailVO.getAddS());
tOptometryDetail.setPupilHeight(optometryDetailVO.getPupilHeight());
tOptometryDetail.setPupilDistance(optometryDetailVO.getPupilDistance());
tOptometryDetail.setCorrect(optometryDetailVO.getCorrect());
@@ -193,5 +230,6 @@
return ApiResult.success();
}
+
}
--
Gitblit v1.7.1