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 | 12 ++++++++----
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java | 6 +++++-
2 files changed, 13 insertions(+), 5 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 45ab478..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
@@ -142,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);
@@ -164,7 +164,7 @@
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);
// 剩余兑换数量
@@ -244,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());
@@ -848,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);
}
diff --git a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
index e967318..8c1ef8e 100644
--- a/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/TGoodsServiceImpl.java
@@ -176,12 +176,14 @@
.stream().mapToInt(Integer::intValue).sum();
}
Integer userCount = good.getUserCount();
- if (good.getUserCount() > totalNumber) {
+ if (userCount > totalNumber) {
int i = userCount - totalNumber;
if (number > i) {
return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
i + "！");
}
+ } else {
+ return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量！");
}
}
boolean result = exchangeGood(goodExchange, recipient, number, goodId, needIntegral);
@@ -320,6 +322,8 @@
return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量，剩余兑换数量为: " +
i + "！");
}
+ } else {
+ return R.exchangeError("兑换失败，当前兑换数量已超过最大兑换数量！");
}
}
boolean result = exchangeGoodParent(goodExchange, recipient, number, goodId, needIntegral);
--
Gitblit v1.7.1