From 64bb637143020ceef85ae724ac6ce70b28d455af Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 02 七月 2024 14:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/DolphinEnglish
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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..6dc7f6a 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));
}
@@ -143,7 +142,7 @@
wrapper.or().apply("FIND_IN_SET('" + id + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
wrapper.eq("isDelete", 0);
List<TGoods> list = goodsService.list(wrapper);
- if (!list.isEmpty()){
+ if (!list.isEmpty()) {
return R.fail("当前商品分类被使用,无法删除!");
}
TGoodsType byId = goodsTypeService.getById(id);
@@ -165,10 +164,24 @@
Long temp = 0L;
List<TOrder> list1 = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", tGoods.getId()));
for (TOrder tOrder : list1) {
- temp+=tOrder.getCount();
+ 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);
@@ -231,6 +244,10 @@
@GetMapping("/exchangeRecord")
@ApiOperation(value = "学习端-兑换记录", tags = {"学习端-商城"})
public R<List<ExchangeRecordVO>> exchangeRecord() {
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUserStudy().getUserid());
for (ExchangeRecordVO record : exchangeRecord) {
TGoods goods = goodsService.getById(record.getGoodsId());
@@ -773,7 +790,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);
}
@@ -835,8 +852,8 @@
TUser byId1 = studyClient.getUserById(byId.getUserId()).getData();
tGoodsVO.setUserName(byId1.getName());
tGoodsVO.setPhone(byId1.getPhone());
- if (byId.getProvince()!=null && byId.getCity() != null){
- tGoodsVO.setConsigneeAddress(byId.getProvince()+byId.getCity()+tGoodsVO.getConsigneeAddress());
+ if (byId.getProvince() != null && byId.getCity() != null) {
+ tGoodsVO.setConsigneeAddress(byId.getProvince() + byId.getCity() + tGoodsVO.getConsigneeAddress());
}
return R.ok(tGoodsVO);
}
@@ -863,6 +880,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