Merge branch 'xin' into pxb

彭雪彬

2025-07-15 d98e92ff3cd9bde1398d4f84a393da9397cb6e70

Merge branch 'xin' into pxb

 oying-system/src/main/java/com/oying/modules/hwc/service/impl/CallbackServiceImpl.java

@@ -62,7 +62,7 @@
                                    PayStateEnum stateEnum = PayStateEnum.NOTPAY;
                                    if ("0".equals(map.get("pay_result"))) {
                                        stateEnum = PayStateEnum.SUCCESS;
                                        orderService.operationLog(order, OrderStatusEnum.TWO);
                                        orderService.operationLog(order, OrderStatusEnum.TWO, null);
                                    }
                                    orderService.updatePayStatus(map.get("out_trade_no"), stateEnum, map.get("pay_info"), map.get("time_end"));
                                    // 处理成功

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

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

    @Override