From 0a48c9296de4a9fe3abdb3336800575de7a07c62 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Thu, 28 May 2026 15:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E5=9C=B0=E5=8C=BA=E9=97=AE=E9=A2=98=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4sysOrigin=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/web/UserProfileAndCountryQueryExe.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/command/pay/web/UserProfileAndCountryQueryExe.java b/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/command/pay/web/UserProfileAndCountryQueryExe.java index 26e2c72f..a3a9d6fb 100644 --- a/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/command/pay/web/UserProfileAndCountryQueryExe.java +++ b/rc-service/rc-service-order/order-application/src/main/java/com/red/circle/order/app/command/pay/web/UserProfileAndCountryQueryExe.java @@ -67,18 +67,13 @@ public class UserProfileAndCountryQueryExe { userRegionClient.getRegionId(userProfile.getId()) ); - if (Objects.equals(cmd.getSysOrigin(), SysOriginPlatformEnum.ATYOU.name())) { - ResponseAssert.isTrue(CommonErrorCode.NOT_SUPPORTED_REGION, StringUtils.isNotBlank(regionId)); + ResponseAssert.isTrue(CommonErrorCode.NOT_SUPPORTED_REGION, StringUtils.isNotBlank(regionId)); - List regionRelationList = getRegionRelationList(userProfile, regionId); - ResponseAssert.notEmpty(CommonErrorCode.NOT_SUPPORTED_REGION, regionRelationList); + List regionRelationList = getRegionRelationList(userProfile, regionId); + ResponseAssert.notEmpty(CommonErrorCode.NOT_SUPPORTED_REGION, regionRelationList); - payCountryList = getPayCountryList(regionRelationList); - ResponseAssert.notEmpty(CommonErrorCode.NOT_SUPPORTED_REGION, payCountryList); - - } else { - payCountryList = payCountryService.listAllShelf(); - } + payCountryList = getPayCountryList(regionRelationList); + ResponseAssert.notEmpty(CommonErrorCode.NOT_SUPPORTED_REGION, payCountryList); Map mapCountryCode = getMapCountryCode(payCountryList); ResponseAssert.notEmpty(CommonErrorCode.NOT_SUPPORTED_REGION, mapCountryCode);