迭代版本：2.28

luofl

2025-03-17 e23242d09e31e1c78f7ecdbc2859c9f99a3c4171

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

@@ -483,6 +483,16 @@
        return R.ok(collect);
    }

    /**
     * 获取指定门店的核销订单
     */
    @GetMapping("/getRedeemedOrdersByShop")
    public R<List<Order>> getRedeemedOrdersByShop(@RequestParam("shopId") Integer shopId) {
        return R.ok(orderService.list(new LambdaQueryWrapper<Order>()
                .isNotNull(Order::getEndTime)
                .eq(Order::getShopId, shopId)));
    }


    /**
     * 获取订单快递明细
@@ -624,6 +634,7 @@
            }



        });

        ExcelUtil<OrderExport> util = new ExcelUtil<OrderExport>(OrderExport.class);