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);