From 01788ea18a48b738df0807f656a4007a5f16a13a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 06 一月 2025 17:51:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 2ed18f8..6314de8 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -180,7 +180,6 @@
dto.setPhone(byId.getPhone());
}
orderService.save(dto);
-
List<TOptometryDetail> optometryDetails = dto.getOptometryDetails();
if (!CollectionUtils.isEmpty(optometryDetails)){
for (TOptometryDetail optometryDetail : optometryDetails) {
@@ -224,7 +223,7 @@
one.setTotal(one.getTotal()-1);
tLensGoods.add(one);
}else {
- return ApiResult.failed("商品不存在");
+ return ApiResult.failed("商品库存不足");
}
}else{
TModel one1 = modelService.lambdaQuery().eq(TModel::getName, orderGood.getModelName())
@@ -242,7 +241,7 @@
one.setTotal(one.getTotal()-1);
tFrameGoods.add(one);
}else{
- return ApiResult.failed("商品不存在");
+ return ApiResult.failed("商品库存不足");
}
}
}
--
Gitblit v1.7.1