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 | 15 ++++++++++-----
1 files changed, 10 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 80d10c3..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
@@ -356,11 +356,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 +376,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 +630,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 +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());
@@ -654,7 +657,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 +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