用户保存和展示增加省市

mobile-api/src/main/java/com/antai/sport/http/server/mobile/api/business/sport/user/SportUserService.java

@@ -183,6 +183,10 @@ public class SportUserService {
         loginUser.setWeight(param.getWeight());
         loginUser.setAvatar(param.getAvatar());
         loginUser.setFtp(param.getFtp());
+        loginUser.setProvince(param.getProvince());
+        loginUser.setCity(param.getCity());
+        loginUser.setProvinceName(param.getProvinceName());
+        loginUser.setCityName(param.getCityName());
         sportUserMapper.updateById(loginUser);
         redisTemplate.delete("sport_user::" + loginUser.getPhone());
     }
@@ -352,6 +356,8 @@ public class SportUserService {
             item.setFtp(user.getFtp());
             item.setWeight(user.getWeight());
             item.setWkg(handleWkg(user.getFtp(), user.getWeight()));
+            item.setProvinceName(user.getProvinceName());
+            item.setCityName(user.getCityName());
             resultList.add(item);
         });
         return resultList;

mobile-api/src/main/java/com/antai/sport/http/server/mobile/api/business/sport/user/dto/ReqSaveUserInfo.java

@@ -28,4 +28,12 @@ public class ReqSaveUserInfo {
     private String avatar;
     @ApiModelProperty(value = "ftp")
     private Integer ftp;
+    @ApiModelProperty(value = "省")
+    private Long province;
+    @ApiModelProperty(value = "省名称")
+    private String provinceName;
+    @ApiModelProperty(value = "市")
+    private Long city;
+    @ApiModelProperty(value = "市名称")
+    private String cityName;
 }

mobile-api/src/main/java/com/antai/sport/http/server/mobile/api/business/sport/user/dto/RespBaseUserInfo.java

@@ -28,7 +28,9 @@ public class RespBaseUserInfo {
         avatar = sportUser.getAvatar();
         country = sportUser.getCountry();
         province = sportUser.getProvince();
+        provinceName = sportUser.getProvinceName();
         city = sportUser.getCity();
+        cityName = sportUser.getCityName();
         infoInitialized = sportUser.getInfoInitialized();
         roleInitialized = sportUser.getRoleInitialized();
         equipmentInitialized = sportUser.getEquipmentInitialized();
@@ -63,10 +65,16 @@ public class RespBaseUserInfo {
     private String country;
 
     @ApiModelProperty(value = "省")
-    private String province;
+    private Long province;
+
+    @ApiModelProperty(value = "省名称")
+    private String provinceName;
 
     @ApiModelProperty(value = "市")
-    private String city;
+    private Long city;
+
+    @ApiModelProperty(value = "市名称")
+    private String cityName;
 
     @ApiModelProperty(value = "是否已经初始化个人信息")
     private Boolean infoInitialized;

mobile-api/src/main/java/com/antai/sport/http/server/mobile/api/business/sport/user/dto/RespUserInfo.java

@@ -27,4 +27,9 @@ public class RespUserInfo {
     @ApiModelProperty("功体比")
     private BigDecimal wkg;
 
+    @ApiModelProperty("省名称")
+    private String provinceName;
+
+    @ApiModelProperty("市名称")
+    private String cityName;
 }

repository/src/main/java/com/antai/sport/http/server/repository/sport/entity/SportUser.java

@@ -93,12 +93,22 @@ public class SportUser implements Serializable {
     /**
      * 省
      */
-    private String province;
+    private Long province;
+
+    /**
+     * 省名称
+     */
+    private String provinceName;
 
     /**
      * 市
      */
-    private String city;
+    private Long city;
+
+    /**
+     * 市名称
+     */
+    private String cityName;
 
     /**
      * 初始化个人信息