From 6e23a1d4d7c2e56f229b5391efdc38210f70fc8d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 13:56:54 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
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 a73ad28..53263d6 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -222,10 +222,11 @@
}else {
split = orderGood.getLLens().split(",");
}
- 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, brand.getId()).one();
+// TBrand brand = brandService.lambdaQuery().eq(TBrand::getName, orderGood.getBrandName())
+// .eq(TBrand::getType, 2).one();
+ TLensSeries lensSeries = lensSeriesService.lambdaQuery()
+ .eq(TLensSeries::getId, orderGood.getSeriesId())
+ .one();
TLensGoods one = lensGoodsService.lambdaQuery()
.eq(StringUtils.hasLength(orderGood.getSeriesName()),TLensGoods::getSeriesId, lensSeries.getId())
.eq(StringUtils.hasLength(orderGood.getRefractiveIndex()),TLensGoods::getRefractiveIndex, orderGood.getRefractiveIndex())
@@ -235,7 +236,13 @@
.one();
if (one!=null){
if (one.getTotal()-1<0 && lensSeries.getType()==1 ){
- return ApiResult.failed("库存不足");
+ if (StringUtils.hasLength(orderGood.getRightLens())){
+ orderService.removeById(dto);
+ return ApiResult.failed("镜片（R）库存不足，请重新选择");
+ }else{
+ orderService.removeById(dto);
+ return ApiResult.failed("镜片（L）库存不足，请重新选择");
+ }
}
// 减少对应库存
one.setTotal(one.getTotal()-1);
@@ -274,11 +281,14 @@
lensWarehousingDetailService.save(tLensWarehousingDetail);
}else {
- return ApiResult.failed("商品库存不足");
+ if (lensSeries.getType()==1){
+ orderService.removeById(dto);
+ return ApiResult.failed("商品库存不足");
+ }
}
}else{
- TModel one1 = modelService.lambdaQuery().eq(TModel::getName, orderGood.getModelName())
- .eq(TModel::getColor, orderGood.getColor()).one();
+ TModel one1 = modelService.lambdaQuery()
+ .eq(TModel::getId, orderGood.getModelId()).one();
BigDecimal cost = one1.getCost();
orderGood.setCost(cost);
TFrameGoods one = frameGoodsService.lambdaQuery()
@@ -286,7 +296,8 @@
.eq(TFrameGoods::getColor, orderGood.getColor()).one();
if (one!=null){
if (one.getTotal()-1<0){
- return ApiResult.failed("库存不足");
+ orderService.removeById(dto);
+ return ApiResult.failed("镜架库存不足，请重新选择");
}
// 增加对应库存
one.setTotal(one.getTotal()-1);
@@ -323,7 +334,8 @@
frameWarehousingDetailService.save(tFrameWarehousingDetail);
}else{
- return ApiResult.failed("商品库存不足");
+ orderService.removeById(dto);
+ return ApiResult.failed("镜架库存不足，请重新选择");
}
}
}
@@ -331,13 +343,17 @@
if (dto.getCouponId()!=null){
TCouponReceive couponReceive = couponReceiveService.getById(dto.getCouponId());
if (couponReceive==null){
+ orderService.removeById(dto);
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("优惠券不存在");
+ if (couponReceives.isEmpty()){
+ orderService.removeById(dto);
+ return ApiResult.failed("优惠券不存在");
+ }
TCouponReceive tCouponReceive = couponReceives.get(0);
tCouponReceive.setStatus(2);
tCouponReceive.setUseTime(LocalDateTime.now());
@@ -377,16 +393,16 @@
frameGoodsService.updateBatchById(tFrameGoods);
TAddOptometryVO tAddOptometryVO = new TAddOptometryVO();
TTicket tTicket = tTicketService.lambdaQuery().eq(TTicket::getStoreId, dto.getStoreId())
- .eq(TTicket::getType,1)
+ .eq(TTicket::getType,2)
.eq(TTicket::getStatus, 1).list().stream().findFirst().orElse(null);
if (tTicket==null){
+ orderService.removeById(dto);
return ApiResult.failed("当前门店未绑定小票机");
}
tAddOptometryVO.setSn(tTicket.getCloudId()+"");
tAddOptometryVO.setPhone(dto.getPhone());
List<TOrderGoods> orderGoods1 = dto.getOrderGoods();
ArrayList<TOrderGoodsPrintVO> tOrderGoodsPrintVOS = new ArrayList<>();
- // 复制
for (TOrderGoods orderGood : orderGoods1) {
TOrderGoodsPrintVO tOrderGoodsPrintVO = new TOrderGoodsPrintVO();
BeanUtils.copyProperties(orderGood,tOrderGoodsPrintVO);
--
Gitblit v1.7.1