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 |   75 +++++++++++++++++++++++++++++--------
 1 files changed, 58 insertions(+), 17 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 7a8f0ab..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
@@ -1,20 +1,18 @@
 package com.ruoyi.order.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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 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 org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -30,11 +28,11 @@
 @Api(tags = "订单")
 @RestController
 @RequestMapping("/order")
-public class OrderController {
+public class OrderController extends BaseController {
     @Resource
     private OrderService orderService;
     @Resource
-    TokenService tokenService;
+    private TokenService tokenService;
 
 
     /**
@@ -44,10 +42,19 @@
     @ApiImplicitParams({
             @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
     })
-    @GetMapping("/getMyOrderList/{status}")
-    public R<List<OrderVO>> getMyOrderList(@PathVariable("status") Integer status){
+    @GetMapping("/getMyOrderList")
+    public TableDataInfo<OrderVO> getMyOrderList(@ApiParam("订单状态") Integer status){
+        startPage();
         LoginUser loginUserApplet = tokenService.getLoginUserApplet();
-        return R.ok(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
+        return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
+    }
+
+    /**
+     * 通过订单ids获取订单列表
+     */
+    @PostMapping("/getOrderListByIds")
+    public R<List<Order>> getOrderListByIds(@RequestBody List<Long> ids){
+        return R.ok(orderService.listByIds(ids));
     }
 
     /**
@@ -70,8 +77,11 @@
             @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int", paramType="query"),
     })
     @GetMapping("/check/{orderNumber}/{shopId}")
-    public R<Boolean> check(@PathVariable("orderNumber") String orderNumber, @PathVariable("shopId") Long shopId){
-        return R.ok(orderService.check(orderNumber, shopId));
+    public R<Boolean> check(@PathVariable("orderNumber") String orderNumber, @PathVariable("shopId") Integer shopId){
+        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+        Order order = orderService.getOne(new LambdaQueryWrapper<Order>()
+                .eq(Order::getOrderNumber, orderNumber));
+        return R.ok(orderService.check(order, shopId, loginUserApplet.getUserid()));
     }
 
     /**
@@ -81,8 +91,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();
     }
 
@@ -95,9 +106,39 @@
     })
     @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){
+        // TODO 待完善
+        return R.ok();
+    }
+
+
+
+
 
 
 }

--
Gitblit v1.7.1