Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java

@@ -1,18 +1,19 @@
package com.ruoyi.order.controller;


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 com.ruoyi.order.vo.OrderDetailVO;
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;
@@ -31,6 +32,8 @@
public class OrderController {
    @Resource
    private OrderService orderService;
    @Resource
    TokenService tokenService;


    /**
@@ -40,9 +43,18 @@
    @ApiImplicitParams({
            @ApiImplicitParam(value = "订单状态", name = "status", required = true, dataType = "int"),
    })
    @GetMapping("/list/{status}")
    public R<List<OrderVO>> list(@PathVariable("status") Integer status){
        return R.ok(orderService.getOrderList(status));
    @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));
    }

    /**
@@ -62,11 +74,14 @@
     */
    @ApiOperation(value = "扫码校验", tags = {"小程序-个人中心-门店管理-扫码核销校验"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int"),
            @ApiImplicitParam(value = "分享id", name = "shareId", required = true, dataType = "int", paramType="query"),
    })
    @GetMapping("/check/{orderId}/{shopId}")
    public R<Boolean> check(@PathVariable("orderId") Long orderId, @PathVariable("shopId") Long shopId){
        return R.ok(orderService.check(orderId, shopId));
    @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()));
    }

    /**
@@ -74,7 +89,7 @@
     */
    @ApiOperation(value = "订单核销", tags = {"小程序-个人中心-门店管理-扫码核销"})
    @ApiImplicitParams({
            @ApiImplicitParam(value = "核销码", name = "code", required = true, dataType = "String"),
            @ApiImplicitParam(value = "订单号", name = "code", required = true, dataType = "String"),
    })
    @GetMapping("/writeOff/{code}")
    public R<Void> writeOff(@PathVariable("code") String code){