From a6afa7895bf40a03b3f59a3dff54d7274a757d38 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 06 一月 2025 17:51:26 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderController.java | 4 ++--
manage/src/main/resources/mapping/TLensGoods.xml | 4 ++--
manage/src/main/java/com/jilongda/manage/service/impl/TLensGoodsServiceImpl.java | 2 +-
3 files changed, 5 insertions(+), 5 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 545c00c..6314de8 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderController.java
@@ -223,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())
@@ -241,7 +241,7 @@
one.setTotal(one.getTotal()-1);
tFrameGoods.add(one);
}else{
- return ApiResult.failed("商品不存在");
+ return ApiResult.failed("商品库存不足");
}
}
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TLensGoodsServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TLensGoodsServiceImpl.java
index 305da36..3d6e7cb 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TLensGoodsServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TLensGoodsServiceImpl.java
@@ -54,7 +54,7 @@
JSONObject jsonObject = (JSONObject) object;
String cost = jsonObject.getString("refractiveIndex");
if (tFrameGoodsVO.getRefractiveIndex().equals(cost)){
- tFrameGoodsVO.setSale(jsonObject.getString("sale"));
+ tFrameGoodsVO.setSale(jsonObject.getString("sales"));
tFrameGoodsVO.setCost(jsonObject.getString("cost"));
break;
}
diff --git a/manage/src/main/resources/mapping/TLensGoods.xml b/manage/src/main/resources/mapping/TLensGoods.xml
index ced7528..0d27821 100644
--- a/manage/src/main/resources/mapping/TLensGoods.xml
+++ b/manage/src/main/resources/mapping/TLensGoods.xml
@@ -4,8 +4,8 @@
<select id="lensReceiptList" resultType="com.jilongda.manage.vo.TLensGoodsVO">
- select t1.*,t2.name as series,t4.name as store,
- t2.sphere as sphere,t2.asphericSurface as asphericSurface
+ select t1.*,t2.name as series,t4.name as storeName,
+ t2.sphere as sphere,t2.asphericSurface as asphericSurface,t2.type as type
,t2.doubleNon as doubleNon
,t6.name as brand,t7.frameThreshold
from
--
Gitblit v1.7.1