From 8aa5c669bc1b46be539f56a4b2ec35d977422e59 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 10 七月 2024 21:15:45 +0800
Subject: [PATCH] 分表
---
ruoyi-service/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/TGoodsController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..a86bcaa 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
@@ -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,7 +930,7 @@
@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());
TOrderVO tGoodsVO = new TOrderVO();
@@ -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());
--
Gitblit v1.7.1