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 | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 f410ed4..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())
@@ -280,12 +281,14 @@
lensWarehousingDetailService.save(tLensWarehousingDetail);
}else {
- orderService.removeById(dto);
- 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()
--
Gitblit v1.7.1