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


@@ -1,6 +1,7 @@


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;


@@ -11,6 +12,7 @@


import io.swagger.annotations.ApiImplicitParam;


import io.swagger.annotations.ApiImplicitParams;


import io.swagger.annotations.ApiOperation;


import model.Order;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PathVariable;


import org.springframework.web.bind.annotation.RequestMapping;


@@ -70,8 +72,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()));


    }




    /**