Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-29 974c2f29b973d489512146cc8c7fa58448368959

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/OrderService.java

@@ -16,9 +16,9 @@
 * @since 2024-11-21
 */
public interface OrderService extends IService<Order> {
    List<OrderVO> getOrderList(Integer status);
    List<OrderVO> selectOrderListByUserId(Integer status,Long userId);

    OrderDetailVO getOrderDetail(Long orderId);

    boolean check(Long orderId, Long shopId);
    boolean check(String orderNumber, Long shopId);
}