From 54278cfe4715594f29c5819f40bf2e94d175f87c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 九月 2025 15:26:54 +0800
Subject: [PATCH] 配置
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 15 +++++++++------
1 files changed, 9 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 271293a..c87a3ae 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
@@ -306,7 +306,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 +331,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()))
@@ -361,6 +361,7 @@
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
+ byId.setUserId(null);
byId.setState(3);
byId.setCompleteTime(new Date());
return R.ok(orderService.updateById(byId));
@@ -380,6 +381,7 @@
return R.tokenError("登录失效");
}
TOrder byId = orderService.getById(id);
+ byId.setUserId(null);
byId.setState(3);
byId.setCompleteTime(new Date());
return R.ok(orderService.updateById(byId));
@@ -640,6 +642,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());
@@ -666,6 +669,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 +930,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 +950,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());
@@ -995,8 +1000,6 @@
list1.add(tOrderVO);
}
}
-
-
}
PageInfo<TOrderVO> res = new PageInfo<>(query.getPageNumber(), query.getPageSize());
res.setRecords(list1);
--
Gitblit v1.7.1