moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户国家为空的充值代理列表展示所有充值代理

Browse Source
This commit is contained in:
hokli
2025-09-10 16:07:06 +08:00
parent 779b19c26a
commit 24c972d106
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
accompany-base/accompany-payment/accompany-payment-service/src/main/resources/mapper/RechargeUserMapper.xml
View File

@@ -37,7 +37,9 @@
inner join users u on ru.uid = u.uid
where u.partition_id = #{partitionId}
and ru.has_guild_charge = 1
and (cr.`code` = #{regionCode} or cr.`code` = 'Global')
<if test="regionCode != null">
and (cr.`code` = #{regionCode} or cr.`code` = 'Global')
</if>
</select>
<select id="listByManageUid" resultType="com.accompany.payment.vo.RechargeUserVo">

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildUsdChannelService.java
View File

@@ -34,7 +34,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.accompany.common.constant.Constant.GLOBAL_CODE;
import static com.accompany.common.constant.Constant.SysConfId.GUILD_USD_PROD_TAB_SHOW_CONFIG;
@Slf4j
@@ -207,7 +206,7 @@ public class GuildUsdChannelService {
return Collections.emptyList();
}
RegionInfo regionInfo = regionInfoService.getById(u.getRegionId());
String regionCode = regionInfo == null ? GLOBAL_CODE : regionInfo.getCode();
String regionCode = regionInfo == null ? null : regionInfo.getCode();
List<RechargeUserVo> rechargeUserVoList = rechargeUserService.listByPartitionIdByGuildTab(u.getPartitionId(), regionCode);
if (CollectionUtils.isEmpty(rechargeUserVoList)){