From 5de4a49148636dce6568d37e4c62039934b0a188 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 十月 2025 16:36:34 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 274 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 166 insertions(+), 108 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..c5317d0 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
@@ -1,8 +1,8 @@
package com.ruoyi.goods.controller;
+import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
@@ -17,7 +17,9 @@
import com.ruoyi.goods.vo.TGoodsVO;
import com.ruoyi.goods.vo.TOrderVO;
import com.ruoyi.study.api.domain.TUser;
+import com.ruoyi.study.api.dto.OrderQuery;
import com.ruoyi.study.api.feignClient.StudyClient;
+import com.ruoyi.study.api.vo.UserPersonalCenterVO;
import com.ruoyi.system.api.model.LoginUserParent;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -63,14 +65,9 @@
@PostMapping("/listType")
@ApiOperation(value = "列表查询", tags = {"后台-商品类型管理"})
public R<PageInfo<TGoodsType>> listType(@RequestBody GoodsTypeQuery query) {
- QueryWrapper<TGoodsType> wrapper = new QueryWrapper<>();
- if (StringUtils.hasLength(query.getName())) {
- wrapper.like("name", query.getName());
- }
-// wrapper.ne("isDelete",1);
- wrapper.orderByDesc("id");
- List<TGoodsType> list = goodsTypeService.list(wrapper);
+
PageInfo<TGoodsType> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
+ List<TGoodsType> list = goodsTypeService.listType(query, res);
res.setRecords(list);
return R.ok(res);
}
@@ -81,20 +78,26 @@
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 函数
+ for (int i = 0; i < goodQuery.getType().size(); i++) {
+// if (i == 0){
+// wrapper.apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+// }else{
+ wrapper.or().apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+// }
}
}
wrapper.eq("isDelete", 0);
+ // sort排序
+ wrapper.orderByAsc("CASE WHEN sort IS NULL THEN 1 ELSE 0 END")
+ .orderByAsc("sort")
+ .orderByDesc("createTime");
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
}
@@ -108,15 +111,21 @@
// 初始化条件构造器
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)");
+ if (goodQuery.getType() != null && goodQuery.getType().size() > 0) {
+ for (int i = 0; i < goodQuery.getType().size(); i++) {
+ if (i == 0){
+ wrapper.apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ }else{
+ wrapper.or().apply("FIND_IN_SET('" + goodQuery.getType().get(i) + "', typeIds)"); // 将每个类型 ID 应用于 FIND_IN_SET 函数
+ }
}
}
wrapper.eq("isDelete", 0);
+ // sort排序
+ wrapper.orderByAsc("CASE WHEN sort IS NULL THEN 1 ELSE 0 END")
+ .orderByDesc("sort")
+ .orderByDesc("createTime");
return R.ok(goodsService.page(new PageInfo<>(goodQuery.getPageNumber(), goodQuery.getPageSize()), wrapper));
}
@@ -143,7 +152,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);
@@ -160,16 +169,31 @@
wrapper.like("name", query.getName());
}
wrapper.orderByDesc("id");
- List<TGoods> list = goodsService.list(wrapper);
+ PageInfo<TGoods> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
+
+ List<TGoods> list = goodsService.listAll(query, res);
for (TGoods tGoods : list) {
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);
}
@@ -197,12 +221,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 (byId.getTotal()!=null && dto.getTotal()!=null &&!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("修改成功");
}
@@ -230,10 +264,15 @@
*/
@GetMapping("/exchangeRecord")
@ApiOperation(value = "学习端-兑换记录", tags = {"学习端-商城"})
- public R<List<ExchangeRecordVO>> exchangeRecord() {
- List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(tokenService.getLoginUserStudy().getUserid());
+ public R<PageInfo<ExchangeRecordVO>> exchangeRecord(Integer pageNumber,Integer pageSize) {
+ PageInfo<ExchangeRecordVO> res = new PageInfo<>(pageNumber, pageSize);
+ LoginUserParent loginUserStudy = tokenService.getLoginUserStudy();
+ if (null == loginUserStudy) {
+ return R.tokenError("登录失效！");
+ }
+ List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUserStudy().getUserid());
for (ExchangeRecordVO record : exchangeRecord) {
- TGoods goods = goodsService.getById(record.getGoodsId());
+ TGoods goods = goodsService.getById1(record.getGoodsId());
List<String> typeList;
if (null != goods) {
List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.stream(goods.getTypeIds().split(",")).collect(Collectors.toList()))
@@ -244,38 +283,34 @@
}
record.setGoodsType(typeList);
}
- return R.ok(exchangeRecord);
+ res.setRecords(exchangeRecord);
+ res.setTotal(exchangeRecord.size());
+ return R.ok(res);
}
@GetMapping("/exchangeRecordParent")
@ApiOperation(value = "家长端-兑换记录", tags = {"家长端-兑换记录"})
- public R<Page<TOrder>> exchangeRecordParent(Integer pageNumber, Integer pageSize) {
+ public R<PageInfo<ExchangeRecordVO>> exchangeRecordParent(Integer pageNumber,Integer pageSize) {
+ PageInfo<ExchangeRecordVO> res = new PageInfo<>(pageNumber, pageSize);
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- Page<TOrder> page = orderService.page(new Page<>(pageNumber, pageSize), new QueryWrapper<TOrder>().eq("userId", tokenService.getLoginUser1().getUserid())
- .orderByDesc("createTime"));
- List<TOrder> records = page.getRecords();
- for (TOrder tOrder : records) {
- TGoods byId = goodsService.getById(tOrder.getGoodsId());
- tOrder.setName(byId.getName());
- tOrder.setImg(byId.getCoverImg());
- StringBuilder stringBuilder = new StringBuilder();
- if (StringUtils.hasLength(byId.getTypeIds())) {
- String[] split = byId.getTypeIds().split(",");
- for (String s : split) {
- TGoodsType byId1 = goodsTypeService.getById(s);
- if (byId1 != null) {
- stringBuilder.append(byId1.getName()).append("|");
- }
- }
- // 去除最后一个字符
- stringBuilder.deleteCharAt(stringBuilder.length() - 1);
- tOrder.setType(stringBuilder.toString());
+ List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUser1().getUserid());
+ for (ExchangeRecordVO record : exchangeRecord) {
+ TGoods goods = goodsService.getById1(record.getGoodsId());
+ List<String> typeList;
+ if (null != goods) {
+ List<TGoodsType> goodsTypes = goodsTypeService.lambdaQuery().in(TGoodsType::getId, Arrays.stream(goods.getTypeIds().split(",")).collect(Collectors.toList()))
+ .eq(TGoodsType::getIsDelete, 0).list();
+ typeList = goodsTypes.stream().map(TGoodsType::getName).collect(Collectors.toList());
+ } else {
+ typeList = new ArrayList<>();
}
+ record.setGoodsType(typeList);
}
-
- return R.ok(page);
+ res.setRecords(exchangeRecord);
+ res.setTotal(exchangeRecord.size());
+ return R.ok(res);
}
/**
@@ -287,12 +322,14 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
- public R<Boolean> confirm(@RequestParam Integer id) {
+ public R<Boolean> confirm(@RequestParam String id) {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
+ byId.setUserId(null);
byId.setState(3);
+ byId.setCompleteTime(new Date());
return R.ok(orderService.updateById(byId));
}
@@ -305,11 +342,12 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "id", dataType = "String", required = true)
})
- public R<Boolean> confirmStudy(@RequestParam Integer id) {
+ public R<Boolean> confirmStudy(@RequestParam String id) {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
+ byId.setUserId(null);
byId.setState(3);
byId.setCompleteTime(new Date());
return R.ok(orderService.updateById(byId));
@@ -558,17 +596,24 @@
@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
@ApiImplicitParam(value = "地址信息id", name = "recipientId", dataType = "String", required = true)
})
- public R updateOrderAddressParent(@RequestParam Integer orderId, @RequestParam Integer recipientId) {
+ public R updateOrderAddressParent(@RequestParam String orderId, @RequestParam Integer recipientId) {
if (tokenService.getLoginUser1() == null) {
return R.tokenError("登录失效");
}
- Recipient userId = recipientService.getById(recipientId);
- TOrder byId = orderService.getById(orderId);
- byId.setConsigneeName(userId.getRecipient());
- byId.setConsigneePhone(userId.getRecipientPhone());
- byId.setConsigneeAddress(userId.getAddress());
- orderService.updateById(byId);
- return R.ok("修改成功");
+ Recipient recipient = recipientService.getById(recipientId);
+ TOrder order = orderService.getById(orderId);
+ if (null == order) {
+ throw new GlobalException("订单不存在！");
+ }
+ if (!Constants.ONE.equals(order.getState())) {
+ throw new GlobalException("订单已发货，无法修改收货地址！");
+ }
+ order.setUserId(null);
+ order.setConsigneeName(recipient.getRecipient());
+ order.setConsigneePhone(recipient.getRecipientPhone());
+ order.setConsigneeAddress(recipient.getProvince()+recipient.getCity()+recipient.getAddress());
+ orderService.updateById(order);
+ return R.ok();
}
@GetMapping("/updateOrderAddress")
@@ -578,7 +623,7 @@
@ApiImplicitParam(value = "订单id", name = "orderId", dataType = "String", required = true),
@ApiImplicitParam(value = "地址信息id", name = "recipientId", dataType = "String", required = true)
})
- public R updateOrderAddress(@RequestParam Integer orderId, @RequestParam Integer recipientId) {
+ public R updateOrderAddress(@RequestParam String orderId, @RequestParam Integer recipientId) {
if (tokenService.getLoginUserStudy() == null) {
return R.tokenError("登录失效");
}
@@ -590,9 +635,10 @@
if (!Constants.ONE.equals(order.getState())) {
throw new GlobalException("订单已发货，无法修改收货地址！");
}
- order.setConsigneeName(recipient.getAddress());
+ order.setUserId(null);
+ order.setConsigneeName(recipient.getRecipient());
order.setConsigneePhone(recipient.getRecipientPhone());
- order.setConsigneeAddress(recipient.getAddress());
+ order.setConsigneeAddress(recipient.getProvince()+recipient.getCity()+recipient.getAddress());
orderService.updateById(order);
return R.ok();
}
@@ -619,7 +665,20 @@
if (null == loginUserStudy) {
return R.tokenError("登录失效！");
}
- return R.ok(goodsService.goodRecommend(loginUserStudy.getUserid()));
+ UserPersonalCenterVO data = studyClient.userInfo().getData();
+ List<TGoodsVO> tGoodsVOS = goodsService.goodRecommend(loginUserStudy.getUserid());
+ List<TGoodsVO> res = new ArrayList<>();
+ int temp = 0;
+ for (TGoodsVO re : tGoodsVOS) {
+ if (temp>=3){
+ break;
+ }
+ if (data.getUser().getIntegral()>=re.getIntegral()){
+ res.add(re);
+ temp++;
+ }
+ }
+ return R.ok(res);
}
/**
@@ -659,7 +718,10 @@
if (null != goods.getBasicCount()) {
number += goods.getBasicCount();
}
- number += orderService.getGoodBuyNumber(goods.getId());
+ List<TOrder> list = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", goods.getId()));
+ for (TOrder tOrder : list) {
+ number+=tOrder.getCount();
+ }
// 剩余兑换数量
Integer residueNumber = null;
if (null != goods.getTotal()) {
@@ -682,7 +744,6 @@
*/
@GetMapping("/goodDetailParent")
@ApiOperation(value = "商品详情", tags = {"家长端-商城"})
- @ApiOperationSupport(order = 24)
@ApiImplicitParams({
@ApiImplicitParam(value = "商品id", name = "goodId", dataType = "String", required = true)
})
@@ -702,7 +763,10 @@
if (null != goods.getBasicCount()) {
number += goods.getBasicCount();
}
- number += orderService.getGoodBuyNumber(goods.getId());
+ List<TOrder> list = orderService.list(new QueryWrapper<TOrder>().eq("goodsId", goods.getId()));
+ for (TOrder tOrder : list) {
+ number+=tOrder.getCount();
+ }
// 剩余兑换数量
Integer residueNumber = null;
if (null != goods.getTotal()) {
@@ -735,6 +799,13 @@
.eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
.eq(Recipient::getIsDefault, 1)
.eq(Recipient::getDisabled, 0).one();
+ if (null == recipient) {
+ recipient = recipientService.lambdaQuery()
+ .eq(Recipient::getUserId, tokenService.getLoginUserStudy().getUserid())
+ .eq(Recipient::getDisabled, 0)
+ .orderByDesc(Recipient::getCreateTime)
+ .last("limit 1").one();
+ }
GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
LocalDateTime currentDateTime = LocalDateTime.now();
// 格式化日期和时间信息
@@ -771,12 +842,11 @@
.eq(Recipient::getIsDefault, 1).one();
if (recipient == null) {
// 随便取一条地址数据
- List<Recipient> list = recipientService.lambdaQuery()
+ recipient = recipientService.lambdaQuery()
.eq(Recipient::getUserId, tokenService.getLoginUser1().getUserid())
- .eq(Recipient::getIsDefault, 1).list();
- if (!list.isEmpty()) {
- recipient = list.get(0);
- }
+ .orderByDesc(Recipient::getCreateTime)
+ .eq(Recipient::getDisabled, 0).last("limit 1")
+ .one();
}
GoodDetailVO goodDetailVO = goodsService.redeemNow(goodId, recipient);
LocalDateTime currentDateTime = LocalDateTime.now();
@@ -826,17 +896,17 @@
@PostMapping("/getOrderInfo/{id}")
@ApiOperation(value = "查看详情", tags = {"后台-订单管理"})
@ApiOperationSupport(order = 11)
- public R<TOrderVO> getOrderInfo(@PathVariable("id") Integer id) {
+ public R<TOrderVO> getOrderInfo(@PathVariable("id") String id) {
TOrder byId = orderService.getById(id);
- TGoods byId2 = goodsService.getById(byId.getGoodsId());
+ TGoods byId2 = goodsService.getById1(byId.getGoodsId());
TOrderVO tGoodsVO = new TOrderVO();
BeanUtils.copyProperties(byId, tGoodsVO);
tGoodsVO.setName(byId2.getName());
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);
}
@@ -846,6 +916,7 @@
@ApiOperationSupport(order = 12)
public R getGoodsInfo1(@RequestBody OrderDTO dto) {
TOrder byId = orderService.getById(dto.getId());
+ byId.setUserId(null);
byId.setState(2);
byId.setExpress(dto.getExpress());
byId.setExpressNumber(dto.getExpressNumber());
@@ -863,40 +934,27 @@
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);
}
- List<TOrderVO> list = orderService.listAll(query);
- List<TOrderVO> list1 = new ArrayList<>();
- for (TOrderVO tOrderVO : list) {
- TUser data = studyClient.getUserById(tOrderVO.getUserId()).getData();
- if (data != null) {
- tOrderVO.setUserName(data.getName());
- tOrderVO.setPhone(data.getPhone());
- }
- if (!StringUtils.hasLength(query.getPhone()) && !StringUtils.hasLength(query.getUserName())) {
- list1.add(tOrderVO);
- continue;
- }
- // 如果筛选条件输入了电话或者姓名那么需要过滤掉不符合条件的数据
- if (StringUtils.hasLength(query.getPhone()) && StringUtils.hasLength(query.getUserName())) {
- if (tOrderVO.getPhone().contains(query.getPhone()) && tOrderVO.getUserName().contains(query.getUserName())) {
- list1.add(tOrderVO);
- }
- } else if (StringUtils.hasLength(query.getPhone())) {
- if (tOrderVO.getPhone().contains(query.getPhone())) {
- list1.add(tOrderVO);
- }
- } else if (StringUtils.hasLength(query.getUserName())) {
- if (tOrderVO.getUserName().contains(query.getUserName())) {
- list1.add(tOrderVO);
- }
- }
-
-
- }
PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
- res.setRecords(list1);
+
+ List<TUser> data = studyClient.listAll(query).getData();
+ List<Integer> userIds = data.stream().map(TUser::getId).collect(Collectors.toList());
+ query.setUserIds(userIds);
+ List<TOrderVO> list = orderService.listAll(query,res);
+ for (TOrderVO tOrderVO : list) {
+ TUser user = data.stream().filter(e -> Objects.equals(e.getId(), tOrderVO.getUserId())).findFirst()
+ .orElse(null);
+ if (user != null){
+ tOrderVO.setUserName(user.getName());
+ tOrderVO.setPhone(user.getPhone());
+ }
+ }
+ res.setRecords(list);
return R.ok(res);
}
}
--
Gitblit v1.7.1