Merge branch 'pxb' into xin

xin

2025-09-15 07234fed2dc993366fd4c7673d0e8ada90706bd1

 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);