国家列表排序更改

(cherry picked from commit 3d52e519415915d97b1472c075eeed736ab38660)

rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/room/LiveVoiceRoomRestController.java

@@ -182,8 +182,8 @@ public class LiveVoiceRoomRestController extends BaseController {
    * @eo.request-type formdata
    */
   @GetMapping("/country")
-  public List<CountryCO> listCountry() {
+  public List<CountryCO> listCountry(AppExtCommand cmd) {
-    return liveVoiceRoomService.listRoomCountry();
+    return liveVoiceRoomService.listRoomCountry(cmd.requiredReqUserId());
   }
 
 }

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/room/query/RoomCountryListQryExe.java

@@ -1,9 +1,14 @@
 package com.red.circle.other.app.command.room.query;
 
 import com.red.circle.other.app.dto.clientobject.room.CountryCO;
+import com.red.circle.other.domain.gateway.user.UserProfileGateway;
+import com.red.circle.other.domain.gateway.user.ability.UserRegionGateway;
+import com.red.circle.other.domain.model.user.UserProfile;
+import com.red.circle.other.infra.constant.RegionConstants;
 import com.red.circle.other.infra.database.rds.entity.sys.SysCountryCode;
 import com.red.circle.other.infra.database.rds.service.sys.SysCountryCodeService;
 import com.red.circle.tool.core.text.StringUtils;
+import java.util.ArrayList;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -18,10 +23,43 @@ import org.springframework.stereotype.Component;
 public class RoomCountryListQryExe {
 
   private final SysCountryCodeService sysCountryCodeService;
+  private final UserRegionGateway userRegionGateway;
+  private final UserProfileGateway userProfileGateway;
 
-  public List<CountryCO> execute() {
+  public List<CountryCO> execute(Long userId) {
-    List<SysCountryCode> countries = sysCountryCodeService.listOpenCountry();
+    List<SysCountryCode> all = sysCountryCodeService.listOpenCountry();
-    return countries.stream().map(this::toCountryCO).toList();
+
+    String userRegion = userRegionGateway.getRegionCode(userId);
+    UserProfile userProfile = userProfileGateway.getByUserId(userId);
+    String userCountryCode = userProfile != null ? userProfile.getCountryCode() : null;
+
+    boolean isArRegion = RegionConstants.AR.equals(userRegion);
+
+    List<CountryCO> current = new ArrayList<>();
+    List<CountryCO> arList = new ArrayList<>();
+    List<CountryCO> otherList = new ArrayList<>();
+
+    for (SysCountryCode entity : all) {
+      CountryCO co = toCountryCO(entity);
+      if (StringUtils.isNotBlank(userCountryCode) && userCountryCode.equals(entity.getAlphaTwo())) {
+        current.add(co);
+      } else if (RegionConstants.AR_REGIONS.contains(entity.getAlphaTwo())) {
+        arList.add(co);
+      } else {
+        otherList.add(co);
+      }
+    }
+
+    List<CountryCO> result = new ArrayList<>();
+    result.addAll(current);
+    if (isArRegion) {
+      result.addAll(arList);
+      result.addAll(otherList);
+    } else {
+      result.addAll(otherList);
+      result.addAll(arList);
+    }
+    return result;
   }
 
   private CountryCO toCountryCO(SysCountryCode entity) {

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/room/LiveVoiceRoomServiceImpl.java

@@ -99,8 +99,8 @@ public class LiveVoiceRoomServiceImpl implements LiveVoiceRoomService {
   }
 
   @Override
-  public List<CountryCO> listRoomCountry() {
+  public List<CountryCO> listRoomCountry(Long userId) {
-    return roomCountryListQryExe.execute();
+    return roomCountryListQryExe.execute(userId);
   }
 
   @Override

rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/service/room/LiveVoiceRoomService.java

@@ -40,7 +40,7 @@ public interface LiveVoiceRoomService {
 
   List<RoomVoiceProfileCO> explore(RoomExploreQryCmd cmd);
 
-  List<CountryCO> listRoomCountry();
+  List<CountryCO> listRoomCountry(Long userId);
 
   String createPublicRoomByRegion(AppExtCommand cmd);
 }