From 73e7f2405a5fae2774b802b49216e4526ccb9eaa Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 27 十月 2025 14:06:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
index a8c865b..1890d2e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TSysGoodsController.java
@@ -134,7 +134,7 @@
List<TSysGoodsExchange> list = sysGoodsExchangeService.list(new LambdaQueryWrapper<TSysGoodsExchange>().eq(TSysGoodsExchange::getGoodsId, goods.getId()));
int sum = list.stream().mapToInt(TSysGoodsExchange::getGoodsCount).sum();
- if (goods.getGoodsTotal() < sum) {
+ if (Objects.nonNull(goods.getGoodsTotal()) && goods.getGoodsTotal() < sum) {
return R.fail("商品总数不能小于已兑换数量");
}
if (roleType == 4) {
--
Gitblit v1.7.1