- 增加：增加 rest api(用户地址)

2020-05-08 10:28:38 +08:00
parent 4ec0864626
commit 6b2213d580
15 changed files with 358 additions and 79 deletions
--- a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/convert/user/UserAddressConvert.java
+++ b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/convert/user/UserAddressConvert.java
@@ -1,7 +1,7 @@
 package cn.iocoder.mall.user.biz.convert.user;

 import cn.iocoder.mall.user.biz.bo.user.UserAddressBO;
-import cn.iocoder.mall.user.biz.dataobject.user.UserAddressDO;
+import cn.iocoder.mall.user.biz.dataobject.user.UsersUserAddressDO;
 import cn.iocoder.mall.user.biz.dto.user.UserAddressAddDTO;
 import cn.iocoder.mall.user.biz.dto.user.UserAddressUpdateDTO;
 import org.mapstruct.Mapper;
@@ -22,14 +22,14 @@ public interface UserAddressConvert {
    UserAddressConvert INSTANCE = Mappers.getMapper(UserAddressConvert.class);

    @Mappings({})
-    UserAddressDO convert(UserAddressAddDTO userAddressAddDTO);
+    UsersUserAddressDO convert(UserAddressAddDTO userAddressAddDTO);

    @Mappings({})
-    UserAddressDO convert(UserAddressUpdateDTO userAddressUpdateDTO);
+    UsersUserAddressDO convert(UserAddressUpdateDTO userAddressUpdateDTO);

    @Mappings({})
-    UserAddressBO convert(UserAddressDO userAddressDO);
+    UserAddressBO convert(UsersUserAddressDO userAddressDO);

    @Mappings({})
-    List<UserAddressBO> convertUserAddressBOList(List<UserAddressDO> userAddressDOList);
+    List<UserAddressBO> convertUserAddressBOList(List<UsersUserAddressDO> userAddressDOList);
 }
--- a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/dao/user/UserAddressMapper.java
+++ b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/dao/user/UserAddressMapper.java
@@ -1,6 +1,6 @@
 package cn.iocoder.mall.user.biz.dao.user;

-import cn.iocoder.mall.user.biz.dataobject.user.UserAddressDO;
+import cn.iocoder.mall.user.biz.dataobject.user.UsersUserAddressDO;
 import cn.iocoder.mall.user.biz.enums.user.UserAddressHasDefaultEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,18 +16,18 @@ import java.util.List;
 */
@Repository
 // TODO done FROM 芋艿 to 小范：替换成 Mybatis Plus
-public interface UserAddressMapper extends BaseMapper<UserAddressDO> {
+public interface UserAddressMapper extends BaseMapper<UsersUserAddressDO> {

-    default List<UserAddressDO> selectByUserId(Integer userId) {
-        LambdaQueryWrapper<UserAddressDO> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(UserAddressDO::getUserId, userId);
+    default List<UsersUserAddressDO> selectByUserId(Integer userId) {
+        LambdaQueryWrapper<UsersUserAddressDO> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UsersUserAddressDO::getUserId, userId);
        return selectList(wrapper);
    }

-    default UserAddressDO selectHasDefault(Integer userId) {
-        LambdaQueryWrapper<UserAddressDO> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(UserAddressDO::getUserId, userId);
-        wrapper.eq(UserAddressDO::getHasDefault, UserAddressHasDefaultEnum.DEFAULT_ADDRESS_YES.getValue());
+    default UsersUserAddressDO selectHasDefault(Integer userId) {
+        LambdaQueryWrapper<UsersUserAddressDO> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UsersUserAddressDO::getUserId, userId);
+        wrapper.eq(UsersUserAddressDO::getHasDefault, UserAddressHasDefaultEnum.DEFAULT_ADDRESS_YES.getValue());
        return selectOne(wrapper);
    }
 }
--- a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/dataobject/user/UsersUserAddressDO.java
+++ b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/dataobject/user/UsersUserAddressDO.java
@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
 */
@Data
@Accessors(chain = true)
-public class UserAddressDO extends DeletableDO {
+public class UsersUserAddressDO extends DeletableDO {

    /**
     * 编号
--- a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressService.java
+++ b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressService.java
@@ -14,15 +14,49 @@ import java.util.List;
 */
 public interface UserAddressService {

+    /**
+     * 添加地址
+     *
+     * @param userAddressAddDTO
+     */
    void addAddress(UserAddressAddDTO userAddressAddDTO);

+    /**
+     * 更新 - 根据id 更新
+     *
+     * @param userAddressAddDTO
+     */
    void updateAddress(UserAddressUpdateDTO userAddressAddDTO);

+    /**
+     * 删除 - 更新id 删除
+     *
+     * @param userId
+     * @param addressId
+     */
    void removeAddress(Integer userId, Integer addressId);

-    List<UserAddressBO> addressList(Integer userId);
+    /**
+     * 获取 - 用户所有地址
+     *
+     * @param userId
+     * @return
+     */
+    List<UserAddressBO> listAddress(Integer userId);

-    UserAddressBO getAddress(Integer userId, Integer id);
+    /**
+     * 获取 - 根据id 获取地址
+     *
+     * @param id
+     * @return
+     */
+    UserAddressBO getAddress(Integer id);

+    /**
+     * 获取 - 获取用户 default 地址
+     *
+     * @param userId
+     * @return
+     */
    UserAddressBO getDefaultAddress(Integer userId);
 }
--- a/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressServiceImpl.java
+++ b/user/user-biz/src/main/java/cn/iocoder/mall/user/biz/service/user/UserAddressServiceImpl.java
@@ -6,7 +6,7 @@ import cn.iocoder.mall.system.biz.enums.SystemErrorCodeEnum;
 import cn.iocoder.mall.user.biz.bo.user.UserAddressBO;
 import cn.iocoder.mall.user.biz.convert.user.UserAddressConvert;
 import cn.iocoder.mall.user.biz.dao.user.UserAddressMapper;
-import cn.iocoder.mall.user.biz.dataobject.user.UserAddressDO;
+import cn.iocoder.mall.user.biz.dataobject.user.UsersUserAddressDO;
 import cn.iocoder.mall.user.biz.dto.user.UserAddressAddDTO;
 import cn.iocoder.mall.user.biz.dto.user.UserAddressUpdateDTO;
 import cn.iocoder.mall.user.biz.enums.user.UserAddressHasDefaultEnum;
@@ -32,112 +32,101 @@ public class UserAddressServiceImpl implements UserAddressService {
    @Override
    @Transactional
    public void addAddress(UserAddressAddDTO userAddressAddDTO) {
-        UserAddressDO userAddressDO = UserAddressConvert.INSTANCE.convert(userAddressAddDTO);
+
+        // 转换do，设置默认数据
+        UsersUserAddressDO userAddressDO = UserAddressConvert.INSTANCE.convert(userAddressAddDTO);
        userAddressDO.setCreateTime(new Date());
        userAddressDO.setDeleted(DeletedStatusEnum.DELETED_NO.getValue());

        // 检查是否设置为默认地址
        if (UserAddressHasDefaultEnum.DEFAULT_ADDRESS_YES.getValue() == userAddressAddDTO.getHasDefault()) {
-            UserAddressDO defaultUserAddress = userAddressMapper.selectHasDefault(userAddressAddDTO.getUserId());
-
+            UsersUserAddressDO defaultUserAddress = userAddressMapper.selectHasDefault(userAddressAddDTO.getUserId());
            if (defaultUserAddress != null) {
                userAddressMapper.updateById(
-                        new UserAddressDO()
+                        new UsersUserAddressDO()
                                .setId(defaultUserAddress.getId())
                                .setHasDefault(UserAddressHasDefaultEnum.DEFAULT_ADDRESS_NO.getValue())
                );
            }
        }

+        // 保存地址
        userAddressMapper.insert(userAddressDO);
    }

    @Override
+    @Transactional
    public void updateAddress(UserAddressUpdateDTO userAddressAddDTO) {
-        UserAddressDO userAddress = userAddressMapper.selectById(userAddressAddDTO.getId());
-        if (DeletedStatusEnum.DELETED_YES.getValue().equals(userAddress.getDeleted())) {
-            throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.USER_ADDRESS_IS_DELETED.getCode());
-        }
+
+        // 检查地址
+        UsersUserAddressDO userAddress = userAddressMapper.selectById(userAddressAddDTO.getId());

        if (userAddress == null) {
            throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.USER_ADDRESS_NOT_EXISTENT.getCode());
        }

-        // 检查是否设置为默认地址
-        if (UserAddressHasDefaultEnum.DEFAULT_ADDRESS_YES.getValue() == userAddressAddDTO.getHasDefault()) {
-            UserAddressDO defaultUserAddress = userAddressMapper.selectHasDefault(userAddressAddDTO.getUserId());
+        // 删除的地址不能更新
+        if (DeletedStatusEnum.DELETED_YES.getValue().equals(userAddress.getDeleted())) {
+            throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.USER_ADDRESS_IS_DELETED.getCode());
+        }

+        // 检查是否设置为默认地址
+        // 是：将数据库 default address 设置为 no
+        if (UserAddressHasDefaultEnum.DEFAULT_ADDRESS_YES.getValue() == userAddressAddDTO.getHasDefault()) {
+            UsersUserAddressDO defaultUserAddress = userAddressMapper.selectHasDefault(userAddressAddDTO.getUserId());
            if (defaultUserAddress != null && !userAddressAddDTO.getId().equals(defaultUserAddress.getId())) {
                userAddressMapper.updateById(
-                        new UserAddressDO()
+                        new UsersUserAddressDO()
                                .setId(defaultUserAddress.getId())
                                .setHasDefault(UserAddressHasDefaultEnum.DEFAULT_ADDRESS_NO.getValue())
                );
            }
        }

-        UserAddressDO defaultUserAddress = userAddressMapper.selectHasDefault(userAddressAddDTO.getUserId());
-        if (defaultUserAddress != null && !userAddressAddDTO.getId().equals(defaultUserAddress.getId())) {
-            userAddressMapper.updateById(
-                    new UserAddressDO()
-                            .setId(defaultUserAddress.getId())
-                            .setHasDefault(UserAddressHasDefaultEnum.DEFAULT_ADDRESS_NO.getValue())
-            );
-        }
-
-        UserAddressDO userAddressDO = UserAddressConvert.INSTANCE.convert(userAddressAddDTO);
+        // 转换 vo, 并保存数据
+        UsersUserAddressDO userAddressDO = UserAddressConvert.INSTANCE.convert(userAddressAddDTO);
        userAddressDO.setUpdateTime(new Date());
        userAddressMapper.updateById(userAddressDO);
    }

    @Override
    public void removeAddress(Integer userId, Integer addressId) {
-        UserAddressDO userAddress = userAddressMapper.selectById(addressId);
+        // checked address is exists.
+        UsersUserAddressDO userAddress = userAddressMapper.selectById(addressId);
+
+        if (userAddress == null) {
+            throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.USER_ADDRESS_NOT_EXISTENT.getCode());
+        }

        if (DeletedStatusEnum.DELETED_YES.getValue().equals(userAddress.getDeleted())) {
            // skip
            return;
        }

-        if (userAddress == null) {
-            throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.USER_ADDRESS_NOT_EXISTENT.getCode());
-        }
-
+        // 更新状态为 remove
        userAddressMapper.updateById(
-                (UserAddressDO) new UserAddressDO()
+                (UsersUserAddressDO) new UsersUserAddressDO()
                        .setId(addressId)
                        .setDeleted(DeletedStatusEnum.DELETED_YES.getValue())
        );
    }

    @Override
-    public List<UserAddressBO> addressList(Integer userId) {
-        List<UserAddressDO> userAddressDOList = userAddressMapper.selectByUserId(userId);
-
-        List<UserAddressBO> userAddressBOList = UserAddressConvert
-                .INSTANCE.convertUserAddressBOList(userAddressDOList);
-
+    public List<UserAddressBO> listAddress(Integer userId) {
+        List<UsersUserAddressDO> userAddressDOList = userAddressMapper.selectByUserId(userId);
+        List<UserAddressBO> userAddressBOList = UserAddressConvert.INSTANCE.convertUserAddressBOList(userAddressDOList);
        return userAddressBOList;
    }

    @Override
-    public UserAddressBO getAddress(Integer userId, Integer id) {
-        UserAddressDO userAddress = userAddressMapper.selectById(id);
-        if (userAddress == null) {
-            throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.USER_GET_ADDRESS_NOT_EXISTS.getCode());
-        }
-
-        if (DeletedStatusEnum.DELETED_YES.getValue().equals(userAddress.getDeleted())) {
-            throw ServiceExceptionUtil.exception(SystemErrorCodeEnum.USER_ADDRESS_IS_DELETED.getCode());
-        }
-
-        UserAddressBO userAddressBO = UserAddressConvert.INSTANCE.convert(userAddress);
-        return userAddressBO;
+    public UserAddressBO getAddress(Integer id) {
+        UsersUserAddressDO userAddress = userAddressMapper.selectById(id);
+        return UserAddressConvert.INSTANCE.convert(userAddress);
    }

    @Override
    public UserAddressBO getDefaultAddress(Integer userId) {
-        UserAddressDO defaultUserAddress = userAddressMapper.selectHasDefault(userId);
+        UsersUserAddressDO defaultUserAddress = userAddressMapper.selectHasDefault(userId);
        return UserAddressConvert.INSTANCE.convert(defaultUserAddress);
    }
 }