Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

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

@@ -72,6 +72,9 @@
            case HWC2:
                map.put("mch_id", properties.getMchId2());
                break;
            case HWC3:
                map.put("mch_id", properties.getMchId3());
                break;
            default:
                throw new BadRequestException("汇旺财类型错误");
        }
@@ -140,6 +143,9 @@
                break;
            case HWC2:
                map.put("mch_id", properties.getMchId2());
                break;
            case HWC3:
                map.put("mch_id", properties.getMchId3());
                break;
            default:
                throw new BadRequestException("汇旺财类型错误");
@@ -210,6 +216,9 @@
                break;
            case HWC2:
                map.put("mch_id", properties.getMchId2());
                break;
            case HWC3:
                map.put("mch_id", properties.getMchId3());
                break;
            default:
                throw new BadRequestException("汇旺财类型错误");
@@ -286,6 +295,10 @@
                map.put("mch_id", properties.getMchId2());
                map.put("op_user_id", properties.getMchId2());
                break;
            case HWC3:
                map.put("mch_id", properties.getMchId3());
                map.put("op_user_id", properties.getMchId3());
                break;
            default:
                throw new BadRequestException("汇旺财类型错误");
        }