From fd9ad2f58c6e1f4213d5821d68ff1697ba6b6ef0 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期一, 09 十二月 2024 09:47:25 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 92505e4..fc660c8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -6,12 +6,13 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.model.Order;
import com.ruoyi.order.service.OrderService;
+import com.ruoyi.order.vo.OrderDetailVO;
+import com.ruoyi.order.vo.OrderVO;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
-import com.ruoyi.order.vo.OrderDetailVO;
-import com.ruoyi.system.api.model.LoginUser;
-import com.ruoyi.order.model.Order;
import javax.annotation.Resource;
import java.util.List;
@@ -31,7 +32,7 @@
@Resource
private OrderService orderService;
@Resource
- TokenService tokenService;
+ private TokenService tokenService;
/**
@@ -42,7 +43,7 @@
@ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
@GetMapping("/getMyOrderList")
- public TableDataInfo getMyOrderList(@ApiParam("订单状态") Integer status){
+ public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status){
startPage();
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
@@ -90,9 +91,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{code}")
- public R<Void> writeOff(@PathVariable("code") String code){
- // TODO 待完善
+ @GetMapping("/writeOff/{code}/{shopId}")
+ public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){
+ orderService.writeOff(code, shopId);
return R.ok();
}
@@ -122,6 +123,19 @@
return R.ok();
}
+ /**
+ * 更换收货地址
+ */
+ @ApiOperation(value = "更换收货地址", tags = {"小程序-个人中心-我的订单-更换收货地址"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ })
+ @GetMapping("/changeAddress")
+ public R<Void> changeAddress(@RequestParam("orderId") Long orderId, @RequestParam("addressId") Long addressId){
+ // TODO 待完善
+ return R.ok();
+ }
+
--
Gitblit v1.7.1