Merge branch 'pxb' into xin

xin

2025-09-05 6f3c170403f34d452b5dc733043145d8d760fe41

 oying-system/src/main/java/com/oying/modules/sh/service/OrderService.java

@@ -49,7 +49,9 @@

    OrderResponse getByOrderNum(String orderNum);

    void operationLog(OrderResponse order, OrderStatusEnum stateEnum);
    Order queryByOrderNum(String orderNum);

    void operationLog(OrderResponse order, OrderStatusEnum stateEnum,String cardName);

    void updatePayStatus(String outTradeNo, PayStateEnum stateEnum, String payInfo, String timeEnd);

@@ -83,7 +85,7 @@
     */
    void download(List<Order> all, HttpServletResponse response) throws IOException;

    void closeOrder(String orderNum);
    void cancel(String orderNum);

    void statusOrder(StatusOrder statusOrder);
}