岐济生
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
luodangjia
2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java


@@ -1,20 +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;


@@ -51,6 +50,14 @@


    }




    /**


     * 通过订单ids获取订单列表


     */


    @PostMapping("/getOrderListByIds")


    public R<List<Order>> getOrderListByIds(@RequestBody List<Long> ids){


        return R.ok(orderService.listByIds(ids));


    }




    /**


     * 订单详情


     */


    @ApiOperation(value = "订单详情", tags = {"小程序-订单详情"})


@@ -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()));


    }




    /**