From d1632e46b772d691e55b4013585bfe61164b8bde Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 10 一月 2025 18:30:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml | 3
applet/src/main/java/com/jilongda/applet/model/TCouponReceive.java | 3
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 100 ++++++++++++-------
applet/src/main/java/com/jilongda/applet/controller/TCouponReceiveController.java | 1
applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java | 5
manage/src/main/resources/mapping/TCouponReceiveMapper.xml | 2
manage/src/main/java/com/jilongda/manage/component/AliOssManageFileUploadController.java | 2
manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java | 4
manage/src/main/java/com/jilongda/manage/controller/TCouponController.java | 2
applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java | 1
manage/src/main/resources/mapping/TOptometristMapper.xml | 2
optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java | 75 ++++++++------
applet/src/main/resources/mapping/TStoreMapper.xml | 1
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 44 ++++----
manage/src/main/resources/mapping/TFrameGoods.xml | 2
15 files changed, 150 insertions(+), 97 deletions(-)
diff --git a/applet/src/main/java/com/jilongda/applet/controller/TCouponReceiveController.java b/applet/src/main/java/com/jilongda/applet/controller/TCouponReceiveController.java
index 21abfa8..bfb9a8b 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/TCouponReceiveController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/TCouponReceiveController.java
@@ -69,6 +69,7 @@
}
tCouponReceive.setAmountCondition(coupon.getAmountCondition());
tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(coupon.getName());
tCouponReceiveService.save(tCouponReceive);
return ApiResult.success();
}
diff --git a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
index 410183f..fb8fb23 100644
--- a/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
+++ b/applet/src/main/java/com/jilongda/applet/controller/TLineUpController.java
@@ -52,6 +52,7 @@
public ApiResult add(@Validated @RequestBody TLineUp dto) {
// 获取当天该门店的排号
long count = tLineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
+ .likeRight(TLineUp::getCreateTime, LocalDate.now())
.eq(TLineUp::getStoreId, dto.getStoreId()));
dto.setStatus(1);
dto.setUserId(loginInfoUtil.getUserId());
diff --git a/applet/src/main/java/com/jilongda/applet/model/TCouponReceive.java b/applet/src/main/java/com/jilongda/applet/model/TCouponReceive.java
index 3de0f57..7bf7415 100644
--- a/applet/src/main/java/com/jilongda/applet/model/TCouponReceive.java
+++ b/applet/src/main/java/com/jilongda/applet/model/TCouponReceive.java
@@ -65,5 +65,8 @@
@ApiModelProperty(value = "1待使用 2已使用 3已过期")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "优惠券名称")
+ @TableField("couponName")
+ private String couponName;
}
diff --git a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
index fca3a33..9dfebfa 100644
--- a/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
+++ b/applet/src/main/java/com/jilongda/applet/service/impl/TAppUserServiceImpl.java
@@ -47,8 +47,8 @@
if(Objects.isNull(appUser)){
appUser = new TAppUser();
appUser.setPhone(appletUserDecodeData.getPhoneNumber());
- appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar())?appUser.getAvatar():"");
- appUser.setName(StringUtils.hasLength(appUser.getName())?appUser.getName(): RptUtils.around(appletUserDecodeData.getPhoneNumber(),3,4));
+ appUser.setAvatar(StringUtils.hasLength(appUser.getAvatar()) ? appUser.getAvatar() : "");
+ appUser.setName(StringUtils.hasLength(appUser.getName()) ? appUser.getName() : RptUtils.around(appletUserDecodeData.getPhoneNumber(), 3, 4));
appUser.setOpenId(appletUserDecodeData.getOpenId());
this.save(appUser);
// 查询有没有注册发放的优惠券活动
@@ -67,6 +67,7 @@
}
tCouponReceive.setAmountCondition(tCoupon.getAmountCondition());
tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(tCoupon.getName());
couponReceiveMapper.insert(tCouponReceive);
}
}else {
diff --git a/applet/src/main/resources/mapping/TStoreMapper.xml b/applet/src/main/resources/mapping/TStoreMapper.xml
index b8f9c4c..7bdac75 100644
--- a/applet/src/main/resources/mapping/TStoreMapper.xml
+++ b/applet/src/main/resources/mapping/TStoreMapper.xml
@@ -55,6 +55,7 @@
</if>
from t_store
where isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
+ and status = 1
ORDER BY
<if test="query.lon != null and query.lon != '' and query.lat != null and query.lat != ''">
IFNULL(distance,0),
diff --git a/manage/src/main/java/com/jilongda/manage/component/AliOssManageFileUploadController.java b/manage/src/main/java/com/jilongda/manage/component/AliOssManageFileUploadController.java
index 91920e8..cc64c25 100644
--- a/manage/src/main/java/com/jilongda/manage/component/AliOssManageFileUploadController.java
+++ b/manage/src/main/java/com/jilongda/manage/component/AliOssManageFileUploadController.java
@@ -32,7 +32,7 @@
@Slf4j
@Api(tags = "Ali-OSS文件上传接口")
@RestController
-@CrossOrigin
+@CrossOrigin("*")
@RequestMapping("/ali-oss/")
public class AliOssManageFileUploadController {
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
index b438b94..e7715b0 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TCouponController.java
@@ -93,6 +93,7 @@
}
tCouponReceive.setAmountCondition(dto.getAmountCondition());
tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(dto.getName());
tCouponReceives.add(tCouponReceive);
}
couponReceiveService.saveBatch(tCouponReceives);
@@ -112,6 +113,7 @@
}
tCouponReceive.setAmountCondition(dto.getAmountCondition());
tCouponReceive.setStatus(1);
+ tCouponReceive.setCouponName(dto.getName());
tCouponReceives1.add(tCouponReceive);
}
couponReceiveService.saveBatch(tCouponReceives1);
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
index d169bb7..fe8dd7b 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -81,35 +81,39 @@
@ApiOperation(value = "订单售后详情")
@GetMapping(value = "/detail")
public ApiResult<TOrderAftersalesDetailVO> detail(Integer id) {
- TOrderAftersales byId = orderAftersalesService.getById(id);
- TOrder byId1 = orderService.getById(byId.getOrderId());
- TStore byId2 = tStoreService.getById(byId1.getStoreId());
- SecUser byId3 = secUserService.getById(byId.getSysId());
- TOptometrist byId5 = tOptometristService.getById(byId.getOptometristId());
+ TOrderAftersales orderAftersales = orderAftersalesService.getById(id);
+ TOrder order = orderService.getById(orderAftersales.getOrderId());
+ TStore store = tStoreService.getById(order.getStoreId());
+ SecUser sysUser = secUserService.getById(orderAftersales.getSysId());
+ TOptometrist optometrist = tOptometristService.getById(orderAftersales.getOptometristId());
TOrderAftersalesDetailVO res = new TOrderAftersalesDetailVO();
- BeanUtils.copyProperties(byId,res);
- res.setOrderId(byId1.getId());
- if (byId1.getUserId()!=null){
- TAppUser byId4 = appUserService.getById(byId1.getUserId());
+ BeanUtils.copyProperties(orderAftersales,res);
+ res.setOrderId(order.getId());
+ if (order.getUserId()!=null){
+ TAppUser byId4 = appUserService.getById(order.getUserId());
if (byId4!=null){
res.setPhone(byId4.getPhone());
res.setName(byId4.getName());
res.setRealName(byId4.getRealName());
}
}else{
- res.setPhone(byId1.getPhone());
- res.setRealName(byId1.getRealName());
+ res.setPhone(order.getPhone());
+ res.setRealName(order.getRealName());
}
- res.setStoreName(byId2.getName());
- res.setOptometristName(byId5.getName());
- res.setSalesUser(byId3.getNickName());
- res.setOrderTime(TimeUtils.localDateTimeToString(byId1.getCreateTime()));
- res.setAfterSalesTime(TimeUtils.localDateTimeToString(byId.getCreateTime()));
- List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, byId1.getId()).list();
+ res.setStoreName(store.getName());
+ if (optometrist!=null){
+ res.setOptometristName(optometrist.getName());
+ }
+ if (sysUser!=null){
+ res.setSalesUser(sysUser.getNickName());
+ }
+ res.setOrderTime(TimeUtils.localDateTimeToString(order.getCreateTime()));
+ res.setAfterSalesTime(TimeUtils.localDateTimeToString(orderAftersales.getCreateTime()));
+ List<TOrderGoods> list = goodsService.lambdaQuery().eq(TOrderGoods::getOrderId, order.getId()).list();
res.setGoodsList(list);
- res.setOrderMoney(byId1.getOrderMoney());
- res.setCouponMoney(byId1.getCouponMoney());
- res.setPayMoney(byId1.getPayMoney());
+ res.setOrderMoney(order.getOrderMoney());
+ res.setCouponMoney(order.getCouponMoney());
+ res.setPayMoney(order.getPayMoney());
return ApiResult.success(res);
}
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
index ae199ff..3c602bc 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -81,6 +81,8 @@
private TSupplierService supplierService;
@Autowired
private TMaterialService materialService;
+ @Autowired
+ private TLineUpService lineUpService;
@PostMapping("/obs-upload")
@ApiOperation(value = "文件上传",tags = "管理后台-文件上传")
@@ -211,10 +213,10 @@
}else {
split = orderGood.getLLens().split(",");
}
- TBrand one1 = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
+ TBrand brand = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
.eq(TBrand::getType, 2).one();
TLensSeries lensSeries = lensSeriesService.lambdaQuery().eq(TLensSeries::getName, orderGood.getSeriesName())
- .eq(TLensSeries::getBrandId, one1.getId()).one();
+ .eq(TLensSeries::getBrandId, brand.getId()).one();
TLensGoods one = lensGoodsService.lambdaQuery()
.eq(StringUtils.hasLength(orderGood.getSeriesName()),TLensGoods::getSeriesId, lensSeries.getId())
.eq(StringUtils.hasLength(orderGood.getRefractiveIndex()),TLensGoods::getRefractiveIndex, orderGood.getRefractiveIndex())
@@ -229,38 +231,38 @@
// 减少对应库存
one.setTotal(one.getTotal()-1);
tLensGoods.add(one);
- // 生成销售订单主表
-
- TWarehousing tWarehousing = new TWarehousing();
- tWarehousing.setStatus(5);
- tWarehousing.setType(2);
- tWarehousing.setStoreId(dto.getStoreId());
- tWarehousing.setRemark("销售订单-镜片");
- tWarehousing.setOrderNum(dto.getId()+"");
- warehousingService.save(tWarehousing);
- // 生成明细记录
- TLensWarehousingDetail tLensWarehousingDetail = new TLensWarehousingDetail();
- tLensWarehousingDetail.setBrand(orderGood.getBrandName());
- TSupplier supplier = supplierService.getById(lensSeries.getSupplierId());
- if (supplier!=null){
- tLensWarehousingDetail.setSupplier(supplier.getName());
- }
- tLensWarehousingDetail.setSeries(lensSeries.getName());
- tLensWarehousingDetail.setRefractiveIndex(orderGood.getRefractiveIndex());
- if (StringUtils.hasLength(orderGood.getLLens())){
- tLensWarehousingDetail.setBallMirror(orderGood.getLLens().split(",")[0]);
- tLensWarehousingDetail.setColumnMirror(orderGood.getLLens().split(",")[0]);
- }
- if (StringUtils.hasLength(orderGood.getRLens())){
- tLensWarehousingDetail.setBallMirror(orderGood.getRLens().split(",")[0]);
- tLensWarehousingDetail.setColumnMirror(orderGood.getRLens().split(",")[0]);
- }
- tLensWarehousingDetail.setType(orderGood.getType());
- tLensWarehousingDetail.setTotal(1);
- tLensWarehousingDetail.setSeriesId(lensSeries.getId());
- tLensWarehousingDetail.setWarehousingId(tWarehousing.getId());
- tLensWarehousingDetail.setOrderId(dto.getId());
- lensWarehousingDetailService.save(tLensWarehousingDetail);
+// // 生成销售订单主表
+//
+// TWarehousing tWarehousing = new TWarehousing();
+// tWarehousing.setStatus(5);
+// tWarehousing.setType(2);
+// tWarehousing.setStoreId(dto.getStoreId());
+// tWarehousing.setRemark("销售订单-镜片");
+// tWarehousing.setOrderNum(dto.getId()+"");
+// warehousingService.save(tWarehousing);
+// // 生成明细记录
+// TLensWarehousingDetail tLensWarehousingDetail = new TLensWarehousingDetail();
+// tLensWarehousingDetail.setBrand(orderGood.getBrandName());
+// TSupplier supplier = supplierService.getById(lensSeries.getSupplierId());
+// if (supplier!=null){
+// tLensWarehousingDetail.setSupplier(supplier.getName());
+// }
+// tLensWarehousingDetail.setSeries(lensSeries.getName());
+// tLensWarehousingDetail.setRefractiveIndex(orderGood.getRefractiveIndex());
+// if (StringUtils.hasLength(orderGood.getLLens())){
+// tLensWarehousingDetail.setBallMirror(orderGood.getLLens().split(",")[0]);
+// tLensWarehousingDetail.setColumnMirror(orderGood.getLLens().split(",")[0]);
+// }
+// if (StringUtils.hasLength(orderGood.getRLens())){
+// tLensWarehousingDetail.setBallMirror(orderGood.getRLens().split(",")[0]);
+// tLensWarehousingDetail.setColumnMirror(orderGood.getRLens().split(",")[0]);
+// }
+// tLensWarehousingDetail.setType(orderGood.getType());
+// tLensWarehousingDetail.setTotal(1);
+// tLensWarehousingDetail.setSeriesId(lensSeries.getId());
+// tLensWarehousingDetail.setWarehousingId(tWarehousing.getId());
+// tLensWarehousingDetail.setOrderId(dto.getId());
+// lensWarehousingDetailService.save(tLensWarehousingDetail);
}else {
return ApiResult.failed("商品库存不足");
@@ -318,8 +320,13 @@
}
if (dto.getUserId()!=null){
if (dto.getCouponId()!=null){
- List<TCouponReceive> couponReceives = couponReceiveService.lambdaQuery().eq(TCouponReceive::getUserId, dto.getUserId())
- .eq(TCouponReceive::getCouponId, dto.getCouponId())
+ TCouponReceive couponReceive = couponReceiveService.getById(dto.getCouponId());
+ if (couponReceive==null){
+ return ApiResult.failed("优惠券不存在");
+ }
+ List<TCouponReceive> couponReceives = couponReceiveService.lambdaQuery()
+ .eq(TCouponReceive::getUserId, dto.getUserId())
+ .eq(TCouponReceive::getCouponId, couponReceive.getCouponId())
.orderByDesc(TCouponReceive::getCreateTime).list();
if (couponReceives.isEmpty())return ApiResult.failed("优惠券不存在");
TCouponReceive tCouponReceive = couponReceives.get(0);
@@ -330,8 +337,29 @@
}
List<TOptometryDetail> optometryDetails = dto.getOptometryDetails();
if (!CollectionUtils.isEmpty(optometryDetails)){
+ int temp =0;
+ if (dto.getUserId()!=null){
+ TOptometry optometry = new TOptometry();
+ long count = lineUpService.count(Wrappers.lambdaQuery(TLineUp.class)
+ .eq(TLineUp::getStoreId, dto.getStoreId()));
+ optometry.setCode(""+(count+1));
+ optometry.setUserId(dto.getUserId());
+ optometry.setAge(dto.getAge());
+ optometry.setGender(dto.getGender());
+ optometry.setRealName(dto.getRealName());
+ optometry.setPhone(dto.getPhone());
+ optometry.setStoreId(dto.getStoreId());
+ optometry.setStatus(3);
+ optometryService.save(optometry);
+ temp = optometry.getId();
+ }
+
+
for (TOptometryDetail optometryDetail : optometryDetails) {
optometryDetail.setOrderId(dto.getId());
+ if (dto.getUserId()!=null){
+ optometryDetail.setOptometryId(temp);
+ }
}
optometryDetailService.saveBatch(optometryDetails);
}
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
index b7307a5..4e5c1b9 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TWarehousingController.java
@@ -238,7 +238,7 @@
one.setTotal(one.getTotal()-frameWarehousingDetail.getTotal());
list1.add(one);
}else {
- return ApiResult.failed("商品不存在");
+ return ApiResult.failed("库存不足");
}
}
@@ -309,7 +309,7 @@
one.setTotal(one.getTotal()-frameWarehousingDetail.getTotal());
list1.add(one);
}else {
- return ApiResult.failed("商品不存在");
+ return ApiResult.failed("库存不足");
}
}
diff --git a/manage/src/main/resources/mapping/TCouponReceiveMapper.xml b/manage/src/main/resources/mapping/TCouponReceiveMapper.xml
index fe2bb0f..33288c8 100644
--- a/manage/src/main/resources/mapping/TCouponReceiveMapper.xml
+++ b/manage/src/main/resources/mapping/TCouponReceiveMapper.xml
@@ -26,7 +26,7 @@
</sql>
<select id="pageList" resultType="com.jilongda.manage.vo.TAppUserCouponVO">
select t1.*
- t_coupon_receive t1
+ from t_coupon_receive t1
where t1.userId = #{query.id}
and t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
</select>
diff --git a/manage/src/main/resources/mapping/TFrameGoods.xml b/manage/src/main/resources/mapping/TFrameGoods.xml
index 67379d2..0a153e9 100644
--- a/manage/src/main/resources/mapping/TFrameGoods.xml
+++ b/manage/src/main/resources/mapping/TFrameGoods.xml
@@ -5,7 +5,7 @@
<select id="lensReceiptList" resultType="com.jilongda.manage.vo.TFrameGoodsVO">
select t1.*,t2.name as model,t5.name as supplier,t3.name as material,t4.name as store,
- t2.sale as sale,t2.cost as cost,t6.name as brand,t7.frameThreshold
+ t2.sale as sales,t2.cost as cost,t6.name as brand,t7.frameThreshold
from
t_frame_goods t1
left join t_model t2 on t1.modelId=t2.id
diff --git a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
index c1008ee..69e1807 100644
--- a/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
+++ b/manage/src/main/resources/mapping/TLensWarehousingDetailMapper.xml
@@ -28,7 +28,7 @@
</sql>
<select id="pageLensList" resultType="com.jilongda.manage.vo.TLensWarehousingDetailVO">
select tlwd.id, tlwd.warehousingId, tlwd.brand, tlwd.supplier, tlwd.series, tlwd.total, tlwd.refractiveIndex, tlwd.ballMirror, tlwd.code, tlwd.createTime,tlwd.columnMirror,
- tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`,tw.storeId
+ tlwd.updateTime, tlwd.createBy, tlwd.updateBy, tlwd.isDelete, tlwd.`type`,tw.storeId,tw.status as status
from t_lens_warehousing_detail tlwd
left join t_warehousing tw on tlwd.warehousingId = tw.id
<where>
@@ -61,6 +61,7 @@
</if>
and tlwd.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
</where>
+ and tw.status!=5
ORDER BY tlwd.createTime DESC
</select>
diff --git a/manage/src/main/resources/mapping/TOptometristMapper.xml b/manage/src/main/resources/mapping/TOptometristMapper.xml
index 3005ab6..fe26927 100644
--- a/manage/src/main/resources/mapping/TOptometristMapper.xml
+++ b/manage/src/main/resources/mapping/TOptometristMapper.xml
@@ -38,7 +38,7 @@
and t2.`name` like concat('%',#{query.name},'%')
</if>
<if test="query.userId != null and query.userId != ''">
- and t2.id like concat('%',#{query.userId},'%')
+ and t1.userId like concat('%',#{query.userId},'%')
</if>
<if test="query.realName != null and query.realName != ''">
and t1.realName like concat('%',#{query.realName},'%')
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 f7539ab..92d624e 100644
--- a/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
+++ b/optometrist/src/main/java/com/jilongda/optometrist/controller/TOptometristController.java
@@ -100,33 +100,39 @@
tDetailVO.setCreateTime(one.getCreateTime());
return ApiResult.success(tDetailVO);
}
+
+ public static void main(String[] args) {
+// LocalDateTime now = LocalDateTime.now();
+// // 获取凌晨00：00：00和23：59：59
+// LocalDateTime startTime = now.withHour(0).withMinute(0).withSecond(0);
+// LocalDateTime endTime = now.withHour(23).withMinute(59).withSecond(59);
+// System.err.println(startTime);
+// System.err.println(endTime);
+ }
@ApiOperation(value = "首页")
@PostMapping(value = "/index")
public ApiResult<TOptometristVO> index() {
TOptometristVO tOptometristVO = new TOptometristVO();
Integer userId = loginInfoUtil.getUserId();
- TOptometrist byId = optometristService.getById(userId);
- TStore byId1 = storeService.getById(byId.getStoreId());
- tOptometristVO.setStoreName(byId1.getName());
- tOptometristVO.setName(byId.getName());
- tOptometristVO.setPhone(byId.getPhone());
- Date start = new Date();
- Date end = new Date();
- // 获取今日凌晨00：00：00和今日23：59：59
- start.setHours(0);
- start.setMinutes(0);
- start.setSeconds(0);
- end.setHours(23);
- end.setMinutes(59);
- end.setSeconds(59);
- int size = optometryService.lambdaQuery().eq(TOptometry::getOptometristId, userId)
- .between(TOptometry::getCreateTime, start, end)
+ TOptometrist optometrist = optometristService.getById(userId);
+ TStore store = storeService.getById(optometrist.getStoreId());
+ tOptometristVO.setStoreName(store.getName());
+ tOptometristVO.setName(optometrist.getName());
+ tOptometristVO.setPhone(optometrist.getPhone());
+ LocalDateTime nowTime = LocalDateTime.now();
+ // 获取凌晨00：00：00和23：59：59
+ LocalDateTime startTime = nowTime.withHour(0).withMinute(0).withSecond(0);
+ LocalDateTime endTime = nowTime.withHour(23).withMinute(59).withSecond(59);
+ int size = optometryService.lambdaQuery().eq(TOptometry::getStoreId, store.getId())
+ .between(TOptometry::getCreateTime, startTime, endTime)
.eq(TOptometry::getStatus, 3).list().size();
tOptometristVO.setOptometryCount(size);
// 查询今日的排号列表
- List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStoreId, byId.getStoreId())
+ List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStoreId, optometrist.getStoreId())
.ne(TLineUp::getStatus, 3)
- .ne(TLineUp::getStatus, 5).list();
+ .ne(TLineUp::getStatus, 5)
+ .orderByAsc(TLineUp::getCode)
+ .list();
for (TLineUp tLineUp : list) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime createTime = tLineUp.getCreateTime();
@@ -176,8 +182,11 @@
public ApiResult startOptometry(Integer id) {
Integer userId = loginInfoUtil.getUserId();
List<TLineUp> list = tLineUpService.lambdaQuery().eq(TLineUp::getStatus, 2)
+ .ne(TLineUp::getId,id)
.eq(TLineUp::getOptometristId, userId).list();
- if (!list.isEmpty())return ApiResult.failed("当前还有未结束的验光单");
+ if (!list.isEmpty()){
+ return ApiResult.failed("当前还有未结束的验光单");
+ }
TLineUp lineUp = tLineUpService.getById(id);
// 获取今天凌晨00：00：00和今日23：59：59
Date start = new Date();
@@ -189,6 +198,7 @@
end.setMinutes(59);
end.setSeconds(59);
List<TLineUp> lineUps = tLineUpService.lambdaQuery().eq(TLineUp::getStoreId, lineUp.getStoreId())
+ .eq(TLineUp::getStatus,1)
.between(TLineUp::getCreateTime, start, end).list();
for (TLineUp up : lineUps) {
if (Integer.parseInt(up.getCode())<Integer.parseInt(lineUp.getCode())){
@@ -197,6 +207,7 @@
}
tLineUpService.updateBatchById(lineUps);
lineUp.setStatus(2);
+ lineUp.setOptometristId(userId);
tLineUpService.updateById(lineUp);
return ApiResult.success();
}
@@ -217,22 +228,22 @@
@ApiOperation(value = "填写验光信息完成")
@PostMapping(value = "/add")
public ApiResult<String> add(@RequestBody TAddOptometryVO dto) {
- TLineUp byId = tLineUpService.getById(dto.getId());
- TAppUser byId1 = appUserService.getById(byId.getUserId());
+ TLineUp lineUp = tLineUpService.getById(dto.getId());
+ TAppUser app = appUserService.getById(lineUp.getUserId());
TOptometry tOptometry = new TOptometry();
- tOptometry.setUserId(byId.getUserId());
- tOptometry.setAge(byId.getAge());
- tOptometry.setGender(byId.getGender());
- if (byId1!=null){
- tOptometry.setPhone(byId1.getPhone());
+ tOptometry.setUserId(lineUp.getUserId());
+ tOptometry.setAge(lineUp.getAge());
+ tOptometry.setGender(lineUp.getGender());
+ if (app!=null){
+ tOptometry.setPhone(app.getPhone());
}
tOptometry.setLineUpId(dto.getId());
Integer userId = loginInfoUtil.getUserId();
- TOptometrist byId2 = optometristService.getById(userId);
- tOptometry.setRealName(byId.getUserName());
+ TOptometrist optometrist = optometristService.getById(userId);
+ tOptometry.setRealName(lineUp.getUserName());
tOptometry.setLineUpId(dto.getId());
tOptometry.setOptometristId(userId);
- tOptometry.setStoreId(byId2.getStoreId());
+ tOptometry.setStoreId(optometrist.getStoreId());
tOptometry.setStatus(3);
optometryService.save(tOptometry);
List<TOptometryDetail> tOptometryDetails = new ArrayList<>();
@@ -248,14 +259,14 @@
tOptometryDetail.setPupilHeight(optometryDetailVO.getPupilHeight());
tOptometryDetail.setPupilDistance(optometryDetailVO.getPupilDistance());
tOptometryDetail.setCorrect(optometryDetailVO.getCorrect());
- tOptometryDetail.setStoreId(byId2.getStoreId());
+ tOptometryDetail.setStoreId(optometrist.getStoreId());
tOptometryDetail.setStatus(optometryDetailVO.getStatus());
tOptometryDetails.add(tOptometryDetail);
}
optometryDetailService.saveBatch(tOptometryDetails);
// 验光完成
- byId.setStatus(3);
- tLineUpService.updateById(byId);
+ lineUp.setStatus(3);
+ tLineUpService.updateById(lineUp);
return ApiResult.success();
}
--
Gitblit v1.7.1