Merge branch 'dev/2024/0607/update-app-Y' of feifan/mall-backend-app into master

添加积分商城所需的参数

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/address/AppAddressController.java

@@ -74,8 +74,8 @@ public class AppAddressController {
     @GetMapping("/list")
     @Operation(summary = "获得用户收件地址列表")
     @PreAuthenticated
-    public CommonResult<List<AppAddressRespVO>> getAddressList() {
-        List<MemberAddressDO> list = addressService.getAddressList(getLoginUserId());
+    public CommonResult<List<AppAddressRespVO>> getAddressList(Integer addressType) {
+        List<MemberAddressDO> list = addressService.getAddressList(getLoginUserId(), addressType);
         return success(AddressConvert.INSTANCE.convertList(list));
     }
 

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/controller/app/address/vo/AppAddressBaseVO.java

@@ -21,7 +21,6 @@ public class AppAddressBaseVO {
     private String mobile;
 
     @Schema(description = "地区编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "地区编号不能为空")
     private Long areaId;
 
     @Schema(description = "收件详细地址", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -32,4 +31,7 @@ public class AppAddressBaseVO {
     @NotNull(message = "是否默认地址不能为空")
     private Boolean defaultStatus;
 
+    @Schema(description = "地址类别", example = "1")
+    private Integer addressType;
+
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/dal/dataobject/address/MemberAddressDO.java

@@ -46,9 +46,13 @@ public class MemberAddressDO extends BaseDO {
     private String detailAddress;
     /**
      * 是否默认
-     *
      * true - 默认收件地址
      */
     private Boolean defaultStatus;
 
+    /**
+     * 地址类别
+     */
+    private Integer addressType;
+
 }

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/address/AddressService.java

@@ -52,9 +52,10 @@ public interface AddressService {
      * 获得用户收件地址列表
      *
      * @param userId 用户编号
+     * @param addressType 地址类型
      * @return 用户收件地址列表
      */
-    List<MemberAddressDO> getAddressList(Long userId);
+    List<MemberAddressDO> getAddressList(Long userId,Integer addressType);
 
     /**
      * 获得用户默认的收件地址

feifan-module-member/feifan-module-member-biz/src/main/java/cn/newfeifan/mall/module/member/service/address/AddressServiceImpl.java

@@ -84,8 +84,8 @@ public class AddressServiceImpl implements AddressService {
     }
 
     @Override
-    public List<MemberAddressDO> getAddressList(Long userId) {
-        return memberAddressMapper.selectListByUserIdAndDefaulted(userId, null);
+    public List<MemberAddressDO> getAddressList(Long userId,Integer addressType) {
+        return memberAddressMapper.selectList(MemberAddressDO::getUserId,userId,MemberAddressDO::getAddressType,addressType);
     }
 
     @Override