fix："优化国家城市选择功能"

src/main/java/com/szwl/controller/TAdminController.java

@@ -477,11 +477,17 @@ public class TAdminController {
                 }
             } else {
                 // 国外
-                LambdaQueryWrapper<Cities> query = Wrappers.lambdaQuery();
-                query.eq(Cities::getCode, registerParam.getCities());
-                Cities cities = citiesService.getOne(query);
-                if (cities != null) {
-                    areaId = cities.getId();
+                LambdaQueryWrapper<Countries> queryCountry = Wrappers.lambdaQuery();
+                queryCountry.eq(Countries::getCode, registerParam.getCountry());
+                Countries countries = countriesService.getOne(queryCountry);
+                if (countries != null) {
+                    LambdaQueryWrapper<Cities> query = Wrappers.lambdaQuery();
+                    query.eq(Cities::getCountryId, countries.getId());
+                    query.eq(Cities::getCode, registerParam.getCities());
+                    Cities cities = citiesService.getOne(query);
+                    if (cities != null) {
+                        areaId = cities.getId();
+                    }
                 }
             }
         }
@@ -1341,16 +1347,22 @@ public class TAdminController {
 
     @ApiOperation("修改地区")
     @GetMapping("/updateArea")
-    public ResponseModel<?> updateArea(String adminId, String areaValue) {
+    public ResponseModel<?> updateArea(String adminId, String areaValue, String country) {
         TAdmin admin = tAdminService.getById(adminId);
         if (admin != null) {
             if (StringUtils.isNotEmpty(admin.getIfForeign()) && admin.getIfForeign().equals("1")) {
                 // 国外
-                LambdaQueryWrapper<Cities> query = Wrappers.lambdaQuery();
-                query.eq(Cities::getCode, areaValue);
-                Cities cities = citiesService.getOne(query);
-                if (cities != null) {
-                    admin.setAreaId(cities.getId());
+                LambdaQueryWrapper<Countries> query = Wrappers.lambdaQuery();
+                query.eq(Countries::getCode, country);
+                Countries countries = countriesService.getOne(query);
+                if (countries != null) {
+                    LambdaQueryWrapper<Cities> cityQuery = Wrappers.lambdaQuery();
+                    cityQuery.eq(Cities::getCountryId, countries.getId());
+                    cityQuery.eq(Cities::getCode, areaValue);
+                    Cities cities = citiesService.getOne(cityQuery);
+                    if (cities != null) {
+                        admin.setAreaId(cities.getId());
+                    }
                 }
             } else {
                 // 国内

src/main/java/com/szwl/model/dto/RegisterParamDTO.java

@@ -21,12 +21,6 @@ public class RegisterParamDTO {
     @ApiModelProperty(value = "是否国外;0：国内，1：国外")
     private String ifForeign;
 
-//    @ApiModelProperty(value = "电话")
-//    private String phone;
-//
-//    @ApiModelProperty(value = "邮箱;")
-//    private String email;
-
     @ApiModelProperty(value = "短信验证码")
     private String code;
 
@@ -39,22 +33,10 @@ public class RegisterParamDTO {
     @ApiModelProperty("邀请码")
     private String inviteCode;
 
-    @ApiModelProperty("地区/国家城市")
+    @ApiModelProperty("国家")
+    private String country;
+
+    @ApiModelProperty("城市")
     private String cities;
 
-//    private Date createDate;
-//
-//    private Date modifyDate;
-//
-//    private Boolean isAdmined;
-//
-//    private Boolean isEnabled;
-//
-//    private Integer loginFailureCount;
-//
-//    private Boolean isLocked;
-//
-//    private Integer type;
-//
-//    private String tradeMerchantNo;
 }