Merge branch 'refs/heads/master' into xin

xin

2025-09-12 8849a8a7032079df128f0c530fd4368cfbc75d81

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

@@ -103,8 +103,8 @@
        // 退款订单号
        String returnNum = redisUtils.generateSn(ORDER_RETURN_KEY, GenerateEnum.ORDER_RETURN.getKey());
        returnOrder.setReturnNum(returnNum);
        returnOrder.setReturnStatus(ReturnAuditEnum.ZERO.getKey());
        returnOrder.setReturnStatusDescribe(ReturnAuditEnum.ZERO.getValue());
        returnOrder.setReturnStatus(OrderStatusEnum.TEN.getKey());
        returnOrder.setReturnStatusDescribe(OrderStatusEnum.TEN.getValue());
        returnOrder.setOrderNum(resources.getOrderNum());
        returnOrder.setOrderTime(order.getOrderTime());
        returnOrder.setOrderStoreNum(order.getOrderStoreNum());
@@ -138,7 +138,7 @@
            }
        }
        productSnapshotService.saveBatch(productSnapshots);
        operationLogService.create(response, OrderStatusEnum.FIFTEEN, null);
        operationLogService.create(response, OrderStatusEnum.TEN, null);
    }

    private static OrderReturnProductSnapshot getSnapshot(OrderProductSnapshot snapshot, String returnNum) {