Merge branch 'xin' into pxb

彭雪彬

2025-07-15 d98e92ff3cd9bde1398d4f84a393da9397cb6e70

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

@@ -241,7 +241,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void statusOrder(StatusOrder statusOrder) {
        operationLog(getByOrderNum(statusOrder.getOrderNum()), statusOrder.getStatus());
        operationLog(getByOrderNum(statusOrder.getOrderNum()), statusOrder.getStatus(), null);
    }

    @Override
@@ -254,8 +254,8 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void operationLog(OrderResponse order, OrderStatusEnum stateEnum) {
        operationLogService.create(order, stateEnum, null);
    public void operationLog(OrderResponse order, OrderStatusEnum stateEnum, String cardName) {
        operationLogService.create(order, stateEnum, cardName);
    }

    @Override