Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-28 36ce1f3549df46609b4e3bc0bf0810bd0c85277e

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

@@ -2,9 +2,11 @@


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 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;
@@ -31,6 +33,8 @@
public class OrderController {
    @Resource
    private OrderService orderService;
    @Resource
    TokenService tokenService;


    /**
@@ -40,9 +44,10 @@
    @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()));
    }

    /**