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 | 113 +++++++++++++++++---------------------------------------
1 files changed, 34 insertions(+), 79 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 80d10c3..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
@@ -17,6 +17,7 @@
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;
@@ -60,49 +61,13 @@
private IRegionService regionService;
@Resource
private TokenService tokenService;
- @PostMapping("/testAddData")
- @ApiOperation(value = "测试分片", tags = {"测试分片"})
- public R<Object> testAddData() {
- TOrder tOrder = new TOrder();
- tOrder.setOrderNumber("");
- tOrder.setUserId(63);
- tOrder.setInsertTime(new Date());
- tOrder.setGoodsId(0);
- tOrder.setCount(0);
- tOrder.setState(0);
- tOrder.setExpress("");
- tOrder.setExpressNumber("");
- tOrder.setExpressTime(new Date());
- tOrder.setIntegral(0);
- tOrder.setCompleteTime(new Date());
- tOrder.setConsigneeName("");
- tOrder.setImg("");
- tOrder.setName("");
- tOrder.setType("");
- tOrder.setConsigneePhone("");
- tOrder.setConsigneeAddress("");
- tOrder.setProvince("");
- tOrder.setCity("");
- tOrder.setRemark("");
- tOrder.setDisabled(false);
- tOrder.setCreateBy("");
- tOrder.setCreateTime(new Date());
- tOrder.setUpdateBy("");
- tOrder.setUpdateTime(new Date());
- orderService.save(tOrder);
- return R.ok();
- }
+
@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);
}
@@ -204,7 +169,9 @@
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()));
@@ -227,7 +194,6 @@
}
}
- PageInfo<TGoods> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
res.setRecords(list);
return R.ok(res);
}
@@ -306,7 +272,7 @@
}
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()))
@@ -331,7 +297,7 @@
}
List<ExchangeRecordVO> exchangeRecord = orderService.exchangeRecord(res,tokenService.getLoginUser1().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()))
@@ -356,11 +322,12 @@
@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));
@@ -375,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));
@@ -628,7 +596,7 @@
@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("登录失效");
}
@@ -640,6 +608,7 @@
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());
@@ -654,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("登录失效");
}
@@ -666,6 +635,7 @@
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());
@@ -926,9 +896,9 @@
@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());
@@ -946,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());
@@ -969,37 +940,21 @@
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