Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-05 1e4882c018f13c2b686f2544316672ee66eeced6

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

@@ -3,16 +3,14 @@

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.service.OrderService;
import io.swagger.annotations.*;
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 javax.annotation.Resource;
@@ -29,7 +27,7 @@
@Api(tags = "订单")
@RestController
@RequestMapping("/order")
public class OrderController {
public class OrderController extends BaseController {
    @Resource
    private OrderService orderService;
    @Resource
@@ -43,10 +41,11 @@
    @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 getMyOrderList(@ApiParam("订单状态") Integer status){
        startPage();
        LoginUser loginUserApplet = tokenService.getLoginUserApplet();
        return R.ok(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
        return getDataTable(orderService.selectOrderListByUserId(status, loginUserApplet.getUserid()));
    }

    /**