From 258a4be3919042c7fdc52a75ea5129463014e84c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 02 七月 2024 12:01:59 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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 2ae3e4b..45ab478 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
@@ -81,17 +81,16 @@
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- List<String> type = goodQuery.getType();
String keywords = goodQuery.getKeywords();
// 初始化条件构造器
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
- wrapper = keywords != null && "".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
+ wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
// 类型匹配 todo
if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
StringBuilder temp = new StringBuilder("");
for (String s : goodQuery.getType()) {
- wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ wrapper.apply("FIND_IN_SET('" + s + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
}
}
wrapper.eq("isDelete", 0);
@@ -108,15 +107,15 @@
// 初始化条件构造器
QueryWrapper<TGoods> wrapper = new QueryWrapper<>();
wrapper = keywords != null && !"".equals(keywords.trim()) ? wrapper.like("name", keywords) : wrapper;
-
// 类型匹配 todo
if (goodQuery.getType() != null && !goodQuery.getType().isEmpty()) {
for (String s : goodQuery.getType()) {
// 将每个类型 ID 应用于 FIND_IN_SET 函数
- wrapper.or().apply("FIND_IN_SET('" + s + "', typeIds)");
+ wrapper.apply("FIND_IN_SET('" + s + "', typeIds)");
}
}
wrapper.eq("isDelete", 0);
+ wrapper.orderByAsc("sort");
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
}
@@ -168,7 +167,21 @@
temp+=tOrder.getCount();
}
tGoods.setInventory(temp);
+ // 剩余兑换数量
+ Integer residueNumber = null;
+ if (null != tGoods.getTotal()) {
+ // 计算剩余兑换数量
+ List<TOrder> orderList = orderService.lambdaQuery().eq(TOrder::getGoodsId, tGoods)
+ .eq(TOrder::getDisabled, 0).list();
+ Integer item = 0;
+ for (TOrder order : orderList) {
+ item += order.getCount();
+ }
+ residueNumber = tGoods.getTotal() - item;
+ tGoods.setSurplus(residueNumber);
+ }
}
+
PageInfo<TGoods> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
res.setRecords(list);
return R.ok(res);
@@ -773,7 +786,7 @@
// 随便取一条地址数据
List<Recipient> list = recipientService.lambdaQuery()
.eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
- .eq(Recipient::getIsDefault, 1).list();
+ .list();
if (!list.isEmpty()) {
recipient = list.get(0);
}
@@ -863,6 +876,9 @@
if (query.getEndTime() != null) {
Date parse = format.parse(query.getStartTime());
Date parse1 = format.parse(query.getEndTime());
+ parse1.setHours(23);
+ parse1.setMinutes(59);
+ parse1.setSeconds(59);
query.setStartTime1(parse);
query.setEndTime1(parse1);
}
--
Gitblit v1.7.1