From a981c07d34edd0975b9d556d97c1f851ce79974c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 04 十二月 2024 13:40:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java |   86 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 71 insertions(+), 15 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 1d3b5e8..1bdb648 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,18 +1,22 @@
 package com.ruoyi.order.controller;
 
 
-import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.order.service.OrderService;
+import org.springframework.web.bind.annotation.*;
+import 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 model.Order;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -22,37 +26,89 @@
  * @author luodangjia
  * @since 2024-11-21
  */
-@Api("订单")
+@Api(tags = "订单")
 @RestController
 @RequestMapping("/order")
 public class OrderController {
     @Resource
     private OrderService orderService;
+    @Resource
+    TokenService tokenService;
 
 
     /**
-     * 扫码校验
+     * 我的订单列表
      */
-    @ApiOperation(value = "扫码校验", tags = {"订单核销"})
+    @ApiOperation(value = "我的订单列表", tags = {"小程序-个人中心-我的订单"})
     @ApiImplicitParams({
-            @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int"),
+            @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
     })
-    @GetMapping("/check/{orderId}/{shopId}")
-    public AjaxResult check(@PathVariable("orderId") Integer orderId, @PathVariable("shopId") Integer shopId){
-        return AjaxResult.success(orderService.check(orderId, shopId));
+    @GetMapping("/getMyOrderList/{status}")
+    public R<List<OrderVO>> getMyOrderList(@PathVariable("status") Integer status){
+        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+        return R.ok(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
+    }
+
+    /**
+     * 通过订单ids获取订单列表
+     */
+    @PostMapping("/getOrderListByIds")
+    public R<List<Order>> getOrderListByIds(@RequestBody List<Long> ids){
+        return R.ok(orderService.listByIds(ids));
     }
 
     /**
      * 订单详情
      */
-    @ApiOperation(value = "订单详情", tags = {"订单详情"})
+    @ApiOperation(value = "订单详情", tags = {"小程序-订单详情"})
     @ApiImplicitParams({
             @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
     })
     @GetMapping("/detail/{orderId}")
-    public AjaxResult detail(@PathVariable("orderId") Integer orderId){
-        return AjaxResult.success(orderService.getById(orderId));
+    public R<OrderDetailVO> detail(@PathVariable("orderId") Long orderId){
+        return R.ok(orderService.getOrderDetail(orderId));
     }
 
+    /**
+     * 扫码校验
+     */
+    @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码核销校验"})
+    @ApiImplicitParams({
+            @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") 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()));
+    }
+
+    /**
+     * 订单核销
+     */
+    @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理-扫码核销"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
+    })
+    @GetMapping("/writeOff/{code}")
+    public R<Void> writeOff(@PathVariable("code") String code){
+        return R.ok();
+    }
+
+    /**
+     * 取消订单
+     */
+    @ApiOperation(value = "取消订单", tags = {"小程序-个人中心-我的订单-取消订单"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
+    })
+    @GetMapping("/cancel/{orderId}")
+    public R<Void> cancel(@PathVariable("orderId") Long orderId){
+        return R.ok();
+    }
+
+
+
 }
 

--
Gitblit v1.7.1