修改 address 提交参数

user-service-project/user-service-api/src/main/java/cn/iocoder/mall/userservice/rpc/address/dto/UserAddressCreateReqDTO.java

@@ -30,20 +30,10 @@ public class UserAddressCreateReqDTO implements Serializable {
     @NotEmpty(message = "手机号不能为空")
     private String mobile;
     /**
-     * 省份编号
+     * 地区编码
      */
-    @NotNull(message = "省份编号不能为空")
+    @NotNull(message = "地区编码不能为空")
-    private Integer provinceCode;
+    private Integer areaCode;
-    /**
-     * 城市编号
-     */
-    @NotNull(message = "城市编号不能为空")
-    private Integer cityCode;
-    /**
-     * 区域编号
-     */
-    @NotNull(message = "区域编号不能为空")
-    private Integer countyCode;
     /**
      * 收件详细地址
      */

user-service-project/user-service-api/src/main/java/cn/iocoder/mall/userservice/rpc/address/dto/UserAddressRespDTO.java

@@ -30,17 +30,9 @@ public class UserAddressRespDTO implements Serializable {
      */
     private String mobile;
     /**
-     * 省份编号
+     * 地区编码
      */
-    private Integer provinceCode;
+    private Integer areaCode;
-    /**
-     * 城市编号
-     */
-    private Integer cityCode;
-    /**
-     * 区域编号
-     */
-    private Integer countyCode;
     /**
      * 收件详细地址
      */

user-service-project/user-service-api/src/main/java/cn/iocoder/mall/userservice/rpc/address/dto/UserAddressUpdateReqDTO.java

@@ -41,20 +41,10 @@ public class UserAddressUpdateReqDTO implements Serializable {
     @Mobile
     private String mobile;
     /**
-     * 省份编号
+     * 地区编码
      */
-    @NotNull(message = "省份编号不能为空")
+    @NotNull(message = "地区编码不能为空")
-    private Integer provinceCode;
+    private Integer areaCode;
-    /**
-     * 城市编号
-     */
-    @NotNull(message = "城市编号不能为空")
-    private Integer cityCode;
-    /**
-     * 区域编号
-     */
-    @NotNull(message = "区域编号不能为空")
-    private Integer countyCode;
     /**
      * 收件详细地址
      */

user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/dataobject/address/UserAddressDO.java

@@ -38,17 +38,9 @@ public class UserAddressDO extends DeletableDO {
      */
     private String mobile;
     /**
-     * 省份编号
+     * 地区编码
      */
-    private Integer provinceCode;
+    private Integer areaCode;
-    /**
-     * 城市编号
-     */
-    private Integer cityCode;
-    /**
-     * 区域编号
-     */
-    private Integer countyCode;
     /**
      * 收件详细地址
      */

user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/dal/mysql/mapper/address/UserAddressMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface UserAddressMapper extends BaseMapper<UserAddressDO> {
 
     default List<UserAddressDO> selectListByUserIdAndType(Integer userId, @Nullable Integer type) {
-        return selectList(new QueryWrapperX<UserAddressDO>().eq("userId", userId)
+        return selectList(new QueryWrapperX<UserAddressDO>().eq("user_id", userId)
             .eqIfPresent("type", type));
     }
 

user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/address/bo/UserAddressBO.java

@@ -29,17 +29,9 @@ public class UserAddressBO {
      */
     private String mobile;
     /**
-     * 省份编号
+     * 地区编码
      */
-    private Integer provinceCode;
+    private Integer areaCode;
-    /**
-     * 城市编号
-     */
-    private Integer cityCode;
-    /**
-     * 区域编号
-     */
-    private Integer countyCode;
     /**
      * 收件详细地址
      */
@@ -52,13 +44,5 @@ public class UserAddressBO {
      * 创建时间
      */
     private Date createTime;
-    /**
-     * 最后更新时间
-     */
-    private Date updateTime;
-    /**
-     * 删除状态
-     */
-    private Integer deleted;
 
 }

user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/address/bo/UserAddressCreateBO.java

@@ -31,20 +31,10 @@ public class UserAddressCreateBO {
     @Mobile
     private String mobile;
     /**
-     * 省份编号
+     * 地区编码
      */
-    @NotNull(message = "省份编号不能为空")
+    @NotNull(message = "地区编码不能为空")
-    private Integer provinceCode;
+    private Integer areaCode;
-    /**
-     * 城市编号
-     */
-    @NotNull(message = "城市编号不能为空")
-    private Integer cityCode;
-    /**
-     * 区域编号
-     */
-    @NotNull(message = "区域编号不能为空")
-    private Integer countyCode;
     /**
      * 收件详细地址
      */

user-service-project/user-service-app/src/main/java/cn/iocoder/mall/userservice/service/address/bo/UserAddressUpdateBO.java

@@ -34,20 +34,10 @@ public class UserAddressUpdateBO {
     @NotEmpty(message = "手机号不能为空")
     private String mobile;
     /**
-     * 省份编号
+     * 地区编码
      */
-    @NotNull(message = "省份编号不能为空")
+    @NotNull(message = "地区编码不能为空")
-    private Integer provinceCode;
+    private Integer areaCode;
-    /**
-     * 城市编号
-     */
-    @NotNull(message = "城市编号不能为空")
-    private Integer cityCode;
-    /**
-     * 区域编号
-     */
-    @NotNull(message = "区域编号不能为空")
-    private Integer countyCode;
     /**
      * 收件详细地址
      */

user-service-project/user-service-app/src/main/resources/application.yaml

@@ -38,6 +38,8 @@ dubbo:
       version: 1.0.0
     UserSmsCodeRpc:
       version: 1.0.0
+    UserAddressRpc:
+      version: 1.0.0
   # Dubbo 服务消费者的配置
   consumer:
     OAuth2Rpc:

user-web-app/src/main/java/cn/iocoder/mall/userweb/controller/address/UserAddressController.java

@@ -23,7 +23,7 @@ import static cn.iocoder.common.framework.vo.CommonResult.success;
 * 用户收件地址 Controller
 */
 @RestController
-@RequestMapping("/user_address")
+@RequestMapping("/user-address")
 @Api(tags = "用户收件地址")
 @Validated
 public class UserAddressController {
@@ -65,10 +65,9 @@ public class UserAddressController {
 
     @GetMapping("/list")
     @ApiOperation("获得用户收件地址列表")
-    @ApiImplicitParam(name = "userAddressIds", value = "用户收件地址编号列表", required = true)
     @RequiresPermissions
-    public CommonResult<List<UserAddressRespVO>> listUserAddresses(@RequestParam("userAddressIds") List<Integer> userAddressIds) {
+    public CommonResult<List<UserAddressRespVO>> listUserAddresses() {
-        return success(userAddressManager.listUserAddresses(UserSecurityContextHolder.getUserId(), userAddressIds));
+        return success(userAddressManager.listUserAddresses(UserSecurityContextHolder.getUserId()));
     }
 
 }

user-web-app/src/main/java/cn/iocoder/mall/userweb/controller/address/vo/UserAddressCreateReqVO.java

@@ -19,15 +19,9 @@ public class UserAddressCreateReqVO {
     @ApiModelProperty(value = "手机号", required = true, example = "15601691300")
     @NotEmpty(message = "手机号不能为空")
     private String mobile;
-    @ApiModelProperty(value = "省份编号", required = true, example = "230000")
-    @NotNull(message = "省份编号不能为空")
-    private Integer provinceCode;
-    @ApiModelProperty(value = "城市编号", required = true, example = "469031")
-    @NotNull(message = "城市编号不能为空")
-    private Integer cityCode;
     @ApiModelProperty(value = "区域编号", required = true, example = "610632")
-    @NotNull(message = "区域编号不能为空")
+    @NotNull(message = "地区编码不能为空")
-    private Integer countyCode;
+    private Integer areaCode;
     @ApiModelProperty(value = "收件详细地址", required = true, example = "芋道源码 233 号 666 室")
     @NotEmpty(message = "收件详细地址不能为空")
     private String detailAddress;

user-web-app/src/main/java/cn/iocoder/mall/userweb/controller/address/vo/UserAddressRespVO.java

@@ -1,35 +1,31 @@
 package cn.iocoder.mall.userweb.controller.address.vo;
 
-import lombok.*;
+import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.*;
+import io.swagger.annotations.ApiModelProperty;
-import java.util.*;
+import lombok.Data;
+
+import java.util.Date;
 
 @ApiModel("用户收件地址 Response VO")
 @Data
 public class UserAddressRespVO {
 
-    @ApiModelProperty(value = "收件地址编号", required = true)
+    @ApiModelProperty(value = "收件地址编号", required = true, example = "1024")
     private Integer id;
-    @ApiModelProperty(value = "用户编号", required = true)
+    @ApiModelProperty(value = "用户编号", required = true, example = "2048")
     private Integer userId;
-    @ApiModelProperty(value = "收件人名称", required = true)
+    @ApiModelProperty(value = "收件人名称", required = true, example = "帅艿艿")
     private String name;
-    @ApiModelProperty(value = "手机号", required = true)
+    @ApiModelProperty(value = "手机号", required = true, example = "15601691300")
     private String mobile;
-    @ApiModelProperty(value = "省份编号", required = true)
+    @ApiModelProperty(value = "区域编号", required = true, example = "610632")
-    private Integer provinceCode;
+    private Integer areaCode;
-    @ApiModelProperty(value = "城市编号", required = true)
+    @ApiModelProperty(value = "收件详细地址", required = true, example = "芋道源码 233 号 666 室")
-    private Integer cityCode;
-    @ApiModelProperty(value = "区域编号", required = true)
-    private Integer countyCode;
-    @ApiModelProperty(value = "收件详细地址", required = true)
     private String detailAddress;
-    @ApiModelProperty(value = "地址类型", required = true)
+    @ApiModelProperty(value = "地址类型", required = true, example = "1", notes = "参见 UserAddressType 枚举类")
     private Integer type;
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;
-    @ApiModelProperty(value = "最后更新时间", required = true)
-    private Date updateTime;
 
 }
 

user-web-app/src/main/java/cn/iocoder/mall/userweb/controller/address/vo/UserAddressUpdateReqVO.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 @Data
 public class UserAddressUpdateReqVO {
 
-    @ApiModelProperty(value = "收件地址编号", required = true)
+    @ApiModelProperty(value = "收件地址编号", required = true, example = "1024")
     @NotNull(message = "收件地址编号不能为空")
     private Integer id;
     @ApiModelProperty(value = "收件人名称", required = true, example = "帅艿艿")
@@ -22,15 +22,9 @@ public class UserAddressUpdateReqVO {
     @ApiModelProperty(value = "手机号", required = true, example = "15601691300")
     @NotEmpty(message = "手机号不能为空")
     private String mobile;
-    @ApiModelProperty(value = "省份编号", required = true, example = "230000")
-    @NotNull(message = "省份编号不能为空")
-    private Integer provinceCode;
-    @ApiModelProperty(value = "城市编号", required = true, example = "469031")
-    @NotNull(message = "城市编号不能为空")
-    private Integer cityCode;
     @ApiModelProperty(value = "区域编号", required = true, example = "610632")
-    @NotNull(message = "区域编号不能为空")
+    @NotNull(message = "地区编码不能为空")
-    private Integer countyCode;
+    private Integer areaCode;
     @ApiModelProperty(value = "收件详细地址", required = true, example = "芋道源码 233 号 666 室")
     @NotEmpty(message = "收件详细地址不能为空")
     private String detailAddress;

user-web-app/src/main/java/cn/iocoder/mall/userweb/manager/address/UserAddressManager.java

@@ -85,14 +85,11 @@ public class UserAddressManager {
     * 获得用户收件地址列表
     *
     * @param userId 用户编号
-    * @param userAddressIds 用户收件地址编号列表
     * @return 用户收件地址列表
     */
-    public List<UserAddressRespVO> listUserAddresses(Integer userId, List<Integer> userAddressIds) {
+    public List<UserAddressRespVO> listUserAddresses(Integer userId) {
-        CommonResult<List<UserAddressRespDTO>> listUserAddressResult = userAddressRpc.listUserAddresses(userAddressIds);
+        CommonResult<List<UserAddressRespDTO>> listUserAddressResult = userAddressRpc.listUserAddresses(userId, null);
         listUserAddressResult.checkError();
-        // 校验是否能够操作
-        listUserAddressResult.getData().forEach(userAddressRespDTO -> check(userId, userAddressRespDTO));
         return UserAddressConvert.INSTANCE.convertList(listUserAddressResult.getData());
     }
 

user-web-app/src/main/resources/application.yml

@@ -35,6 +35,8 @@ dubbo:
       version: 1.0.0
     SystemExceptionLogRpc:
       version: 1.0.0
+    UserAddressRpc:
+      version: 1.0.0
 
 # Swagger 配置项
 swagger: