From 1ab3022a08c32087cbc131fd00e25affacbb5eff Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 03 七月 2024 11:37:42 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
index 6dc7f6a..2330d59 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java
@@ -90,8 +90,12 @@
if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
StringBuilder temp = new StringBuilder("");
for (String s : goodQuery.getType()) {
- wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ temp.append(s);
+ temp.append(",");
}
+ String string = temp.toString();
+ String substring = string.substring(0, string.length() - 1);
+ wrapper.eq("typeIds",substring);
}
wrapper.eq("isDelete", 0);
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
@@ -109,10 +113,14 @@
wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
if (goodQuery.getType() != null && !goodQuery.getType().isEmpty()) {
+ StringBuilder temp = new StringBuilder("");
for (String s : goodQuery.getType()) {
- // 将每个类型 ID 应用于 FIND_IN_SET 函数
- wrapper.apply("FIND_IN_SET('" + s + "', typeIds)");
+ temp.append(s);
+ temp.append(",");
}
+ String string = temp.toString();
+ String substring = string.substring(0, string.length() - 1);
+ wrapper.eq("typeIds",substring);
}
wrapper.eq("isDelete", 0);
wrapper.orderByAsc("sort");
@@ -210,12 +218,22 @@
@PostMapping("/updateGoods")
@ApiOperation(value = "修改", tags = {"后台-商品管理"})
public R updateGoods(@RequestBody TGoods dto) {
- if (dto.getTotal() != null) {
- dto.setSurplus(dto.getTotal());
- } else {
- dto.setSurplus(0);
+ TGoods byId = goodsService.getById(dto.getId());
+ if (!Objects.equals(byId.getTotal(), dto.getTotal())){
+ // 如果修改了商品总数 那么需要再判断当前商品已被购买了多少
+ List<TOrder> list = orderService.list(new QueryWrapper<TOrder>()
+ .eq("goodsId", dto.getId()));
+ Integer temp = 0;
+ for (TOrder tOrder : list) {
+ temp += tOrder.getCount();
+ }
+ if (dto.getTotal()<temp){
+ return R.fail("商品总数不能小于当前商品已兑换数量,"+"当前商品已兑换数量为:"+temp);
+ }
}
goodsService.updateById(dto);
+ goodsService.updateOne(dto);
+
return R.ok("修改成功");
}
--
Gitblit v1.7.1