From 5728732f45cc45f3c5cbde0abe7a7c5efee605b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 09 十二月 2024 15:31:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 76 ++++++++++++++++++++++++++++++++-----
1 files changed, 65 insertions(+), 11 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 06c0f0e..f295ec5 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
@@ -1,21 +1,22 @@
package com.ruoyi.order.controller;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.account.api.feignClient.UserAddressClient;
+import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.common.core.domain.R;
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 org.springframework.web.bind.annotation.*;
import com.ruoyi.order.vo.OrderDetailVO;
import com.ruoyi.order.vo.OrderVO;
import com.ruoyi.system.api.model.LoginUser;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import com.ruoyi.order.model.Order;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -35,7 +36,9 @@
@Resource
private OrderService orderService;
@Resource
- TokenService tokenService;
+ private TokenService tokenService;
+ @Resource
+ private UserAddressClient addressClient;
/**
@@ -45,8 +48,8 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
})
- @GetMapping("/getMyOrderList/{status}")
- public TableDataInfo getMyOrderList(@PathVariable("status") Integer status){
+ @GetMapping("/getMyOrderList")
+ public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status){
startPage();
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
@@ -94,8 +97,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
})
- @GetMapping("/writeOff/{code}")
- public R<Void> writeOff(@PathVariable("code") String code){
+ @GetMapping("/writeOff/{code}/{shopId}")
+ public R<Void> writeOff(@PathVariable("code") String code, @PathVariable("shopId") Integer shopId){
+ orderService.writeOff(code, shopId);
return R.ok();
}
@@ -108,6 +112,56 @@
})
@GetMapping("/cancel/{orderId}")
public R<Void> cancel(@PathVariable("orderId") Long orderId){
+ // TODO 待完善
+ return R.ok();
+ }
+
+ /**
+ * 确认收货
+ */
+ @ApiOperation(value = "确认收货", tags = {"小程序-个人中心-我的订单-确认收货"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+ })
+ @GetMapping("/confirm/{orderId}")
+ public R<Void> confirm(@PathVariable("orderId") Long orderId){
+ // TODO 待完善
+ 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){
+ R<UserAddress> userAddressR = addressClient.getUserAddressById(addressId);
+ if(R.isError(userAddressR)){
+ return R.fail("收货地址不存在");
+ }
+ UserAddress userAddress = userAddressR.getData();
+ String addressJson = JSONObject.toJSONString(userAddress);
+ orderService.update(new LambdaUpdateWrapper<Order>()
+ .eq(Order::getId, orderId)
+ .set(Order::getAddressJson, addressJson));
+ return R.ok();
+ }
+
+ /**
+ * 更新订单状态
+ */
+ @ApiOperation(value = "更新订单状态", tags = {"后台-订单管理-更新订单状态"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单对象", name = "order", required = true, dataType = "Order"),
+ })
+ @PostMapping("/updateOrderStatus")
+ public R<Void> updateOrderStatus(@RequestBody Order order){
+ Order order1 = orderService.getById(order.getId());
+ order1.setOrderStatus(order.getOrderStatus());
+ orderService.updateById(order1);
return R.ok();
}
--
Gitblit v1.7.1