查询订单详情接口修改

src/main/java/com/chaozhanggui/system/cashierservice/controller/OrderController.java

@@ -50,16 +50,14 @@ public class OrderController {
 
     /**
      * 订单详情
-     * @param shopId 店铺id
      * @param orderId 订单id
      * @return 订单信息
      */
     @GetMapping ("/orderInfo")
     public Result getCartByOrderId(
-            @RequestParam Integer shopId,
             @RequestParam Integer orderId
     ){
-        return Result.successWithData(orderService.orderDetail(shopId, orderId));
+        return Result.successWithData(orderService.orderDetail(orderId));
     }
 
     @GetMapping("/orderList")

src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java

@@ -448,16 +448,11 @@ public class OrderService {
         return Result.success(CodeEnum.SUCCESS);
     }
 
-    public Object orderDetail(Integer shopId, Integer orderId) {
+    public Object orderDetail(Integer orderId) {
 
-        TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(shopId);
-        if (tbShopInfo == null) {
-            return Result.fail("店铺不存在");
-        }
 
         TbOrderInfo orderInfo = mpOrderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
-                .eq(TbOrderInfo::getId, orderId)
-                .eq(TbOrderInfo::getShopId, shopId));
+                .eq(TbOrderInfo::getId, orderId));
 
         if (orderInfo == null) {
             return Result.fail("订单不存在");
@@ -467,8 +462,14 @@ public class OrderService {
             return Result.fail("订单不处于待支付状态");
         }
 
+
+        TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
+        if (tbShopInfo == null) {
+            return Result.fail("店铺不存在");
+        }
+
         LambdaQueryWrapper<TbOrderDetail> queryWrapper = new LambdaQueryWrapper<TbOrderDetail>()
-                .eq(TbOrderDetail::getShopId, shopId)
+                .eq(TbOrderDetail::getShopId, orderInfo.getShopId())
                 .eq(TbOrderDetail::getOrderId, orderId);
 
         List<TbOrderDetail> list = mpOrderDetailMapper.selectList(queryWrapper);
@@ -492,8 +493,6 @@ public class OrderService {
             dataList.add(item);
         });
 
-
-
         TbShopTable tbShopTable = shopTableMapper.selectQRcode(orderInfo.getTableId());
 
         OrderVo orderVo = new OrderVo();