Merge branch 'pxb' into xin

xin

2025-09-04 ea26c842829ef69be20ef86d6a546f45c6c5a258

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

@@ -49,6 +49,8 @@

    OrderResponse getByOrderNum(String orderNum);

    Order queryByOrderNum(String orderNum);

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

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