hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 00:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mall：完善收件地址

Browse Source
This commit is contained in:
YunaiV
2022-08-01 22:49:51 +08:00
parent 96e2a27d07
commit 4ce76e82fc
26 changed files with 160 additions and 608 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
View File

@ -22,6 +22,5 @@ public interface ErrorCodeConstants {
// ========== 用户收件地址 1004004000 ==========
ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在");
ErrorCode ADDRESS_FORBIDDEN = new ErrorCode(1004004001, "没有该操作权限");
}

24
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.http
View File

@ -2,53 +2,53 @@
POST {{appApi}}//member/address/create
Content-Type: application/json
tenant-id: {{appTenentId}}
Authorization: Bearer 2510e2e4287346eb8e36353a55e27fd6
Authorization: Bearer {{appToken}}
{
"userId": "245",
"name": "yunai",
"mobile": "15601691300",
"areaCode": "610632",
"areaId": "610632",
"postCode": "200000",
"detailAddress": "芋道源码 233 号 666 室",
"type": "1"
"defaulted": true
}
### 请求 /update 接口 => 成功
PUT {{appApi}}//member/address/update
Content-Type: application/json
tenant-id: {{appTenentId}}
Authorization: Bearer 2510e2e4287346eb8e36353a55e27fd6
Authorization: Bearer {{appToken}}
{
"id": "1",
"userId": "245",
"name": "yunai888",
"mobile": "15601691300",
"areaCode": "610632",
"areaId": "610632",
"postCode": "200000",
"detailAddress": "芋道源码 233 号 666 室",
"type": "1"
"defaulted": false
}
### 请求 /delete 接口 => 成功
DELETE {{appApi}}//member/address/delete?id=2
Content-Type: application/json
tenant-id: {{appTenentId}}
Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
Authorization: Bearer {{appToken}}
### 请求 /get 接口 => 成功
GET {{appApi}}//member/address/get?id=1
Content-Type: application/json
tenant-id: {{appTenentId}}
Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
Authorization: Bearer {{appToken}}
### 请求 /get-default 接口 => 成功
GET {{appApi}}//member/address/get-default
Content-Type: application/json
tenant-id: {{appTenentId}}
Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
Authorization: Bearer {{appToken}}
### 请求 /list 接口 => 成功
GET {{appApi}}//member/address/list
Content-Type: application/json
tenant-id: {{appTenentId}}
Authorization: Bearer fa4848b001de4eae9faf516c0c8520f8
Authorization: Bearer {{appToken}}

27
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
View File

@ -1,10 +1,10 @@
package cn.iocoder.yudao.module.member.controller.app.address.vo;
import cn.iocoder.yudao.framework.common.validation.InEnum;
import cn.iocoder.yudao.module.member.enums.AddressTypeEnum;
import lombok.*;
import io.swagger.annotations.*;
import javax.validation.constraints.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
/**
* 用户收件地址 Base VO，提供给添加、修改、详细的子 VO 使用
@ -21,17 +21,20 @@ public class AppAddressBaseVO {
@NotNull(message = "手机号不能为空")
private String mobile;
@ApiModelProperty(value = "地区编码", required = true)
@NotNull(message = "地区编码不能为空")
private Integer areaCode;
@ApiModelProperty(value = "地区编号", required = true)
@NotNull(message = "地区编号不能为空")
private Long areaId;
@ApiModelProperty(value = "邮编", required = true)
@NotEmpty(message = "邮编不能为空")
private String postCode;
@ApiModelProperty(value = "收件详细地址", required = true)
@NotNull(message = "收件详细地址不能为空")
private String detailAddress;
@ApiModelProperty(value = "地址类型", required = true)
@NotNull(message = "地址类型不能为空")
@InEnum(AddressTypeEnum.class)
private Integer type;
@ApiModelProperty(value = "是否默认地址", required = true)
@NotNull(message = "是否默认地址不能为空")
private Boolean defaulted;
}

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
View File

@ -39,7 +39,7 @@ public class AddressDO extends BaseDO {
/**
* 地区编号
*/
private Integer areaId;
private Long areaId;
/**
* 邮编
*/

54
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
View File

@ -1,64 +1,22 @@
package cn.iocoder.yudao.module.member.dal.mysql.address;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.QueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
import cn.iocoder.yudao.module.member.enums.AddressTypeEnum;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 用户收件地址 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface AddressMapper extends BaseMapperX<AddressDO> {
/**
* 获取当前地址 根据id和userId
* @param userId
* @param id
* @return
*/
default AddressDO getAddressByIdAndUserId(Long userId, Long id) {
QueryWrapperX<AddressDO> queryWrapperX = new QueryWrapperX<>();
queryWrapperX.eq("user_id", userId).eq("id", id);
return selectList(queryWrapperX).stream().findFirst().orElse(null);
default AddressDO selectByIdAndUserId(Long id, Long userId) {
return selectOne(AddressDO::getId, id, AddressDO::getUserId, userId);
}
/**
* 获取地址列表
* @param userId
* @param type
* @return
*/
default List<AddressDO> selectListByUserIdAndType(Long userId, Integer type) {
QueryWrapperX<AddressDO> queryWrapperX = new QueryWrapperX<AddressDO>().eq("user_id", userId)
.eqIfPresent("type", type);
return selectList(queryWrapperX);
}
/**
* 获取默认地址
* @param userId
* @return
*/
default AddressDO getDefaultUserAddress(Long userId) {
List<AddressDO> addressDOList = selectListByUserIdAndType(userId, AddressTypeEnum.DEFAULT.getType());
return addressDOList.stream().findFirst().orElse(null);
}
/**
* 获取默认地址
* @param id
* @param addressTypeEnum
* @return
*/
default int updateTypeById(Long id, AddressTypeEnum addressTypeEnum) {
return updateById(new AddressDO().setId(id).setType(addressTypeEnum.getType()));
default List<AddressDO> selectListByUserIdAndDefaulted(Long userId, Boolean defaulted) {
return selectList(new LambdaQueryWrapperX<AddressDO>().eq(AddressDO::getUserId, userId)
.eqIfPresent(AddressDO::getDefaulted, defaulted));
}
}

16
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
View File

@ -1,10 +1,11 @@
package cn.iocoder.yudao.module.member.service.address;
import java.util.*;
import javax.validation.*;
import cn.iocoder.yudao.module.member.controller.app.address.vo.*;
import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import javax.validation.Valid;
import java.util.List;
/**
* 用户收件地址 Service 接口
@ -55,5 +56,12 @@ public interface AddressService {
*/
List<AddressDO> getAddressList(Long userId);
/**
* 获得用户默认的收件地址
*
* @param userId 用户编号
* @return 用户收件地址
*/
AddressDO getDefaultUserAddress(Long userId);
}

92
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
View File

@ -1,23 +1,20 @@
package cn.iocoder.yudao.module.member.service.address;
import cn.iocoder.yudao.module.member.enums.AddressTypeEnum;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import cn.iocoder.yudao.module.member.controller.app.address.vo.*;
import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
import javax.annotation.Resource;
import java.util.List;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ADDRESS_NOT_EXISTS;
/**
* 用户收件地址 Service 实现类
@ -35,18 +32,11 @@ public class AddressServiceImpl implements AddressService {
@Transactional(rollbackFor = Exception.class)
public Long createAddress(Long userId, AppAddressCreateReqVO createReqVO) {
// 如果添加的是默认收件地址，则将原默认地址修改为非默认
if (AddressTypeEnum.DEFAULT.getType().equals(createReqVO.getType())) {
//查询到一个，然后进行 update
List<AddressDO> addressDOs = selectListByUserIdAndType(userId, AddressTypeEnum.DEFAULT.getType());
AddressDO defaultUserAddress = addressMapper.getDefaultUserAddress(userId);
if (!CollectionUtils.isEmpty(addressDOs)) {
addressDOs.forEach(userAddressDO -> addressMapper.updateById(new AddressDO()
.setId(userAddressDO.getId()).setType(AddressTypeEnum.NORMAL.getType())));
}
Optional.ofNullable(defaultUserAddress)
//更新为非默认
.ifPresent( u -> addressMapper.updateTypeById(u.getId(), AddressTypeEnum.NORMAL));
if (Boolean.TRUE.equals(createReqVO.getDefaulted())) {
List<AddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
addresses.forEach(address -> addressMapper.updateById(new AddressDO().setId(address.getId()).setDefaulted(false)));
}
// 插入
AddressDO address = AddressConvert.INSTANCE.convert(createReqVO);
address.setUserId(userId);
@ -59,17 +49,15 @@ public class AddressServiceImpl implements AddressService {
@Transactional(rollbackFor = Exception.class)
public void updateAddress(Long userId, AppAddressUpdateReqVO updateReqVO) {
// 校验存在,校验是否能够操作
check(userId, updateReqVO.getId());
validAddressExists(userId, updateReqVO.getId());
// 如果修改的是默认收件地址，则将原默认地址修改为非默认
if (AddressTypeEnum.DEFAULT.getType().equals(updateReqVO.getType())) {
//获取默认地址
AddressDO defaultUserAddress = addressMapper.getDefaultUserAddress(userId);
Optional.ofNullable(defaultUserAddress)
//排除当前地址
.filter(u -> !u.getId().equals(updateReqVO.getId()))
//更新为非默认
.ifPresent( u -> addressMapper.updateTypeById(u.getId(), AddressTypeEnum.NORMAL));
if (Boolean.TRUE.equals(updateReqVO.getDefaulted())) {
List<AddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
addresses.stream().filter(u -> !u.getId().equals(updateReqVO.getId())) // 排除自己
.forEach(address -> addressMapper.updateById(new AddressDO().setId(address.getId()).setDefaulted(false)));
}
// 更新
AddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO);
addressMapper.updateById(updateObj);
@ -78,56 +66,32 @@ public class AddressServiceImpl implements AddressService {
@Override
public void deleteAddress(Long userId, Long id) {
// 校验存在,校验是否能够操作
check(userId, id);
validAddressExists(userId, id);
// 删除
addressMapper.deleteById(id);
}
/**
* 校验用户收件地址是不是属于该用户
*
* @param userId 用户编号
* @param userAddressId 用户收件地址
*/
private void check(Long userId, Long userAddressId) {
AddressDO addressDO = getAddress(userId, userAddressId);
if(null == addressDO){
private void validAddressExists(Long userId, Long id) {
AddressDO addressDO = getAddress(userId, id);
if (addressDO == null) {
throw exception(ADDRESS_NOT_EXISTS);
}
if (!addressDO.getUserId().equals(userId)) {
throw exception(ADDRESS_FORBIDDEN);
}
}
@Override
public AddressDO getAddress(Long userId, Long id) {
return addressMapper.getAddressByIdAndUserId(userId, id);
return addressMapper.selectByIdAndUserId(id, userId);
}
@Override
public List<AddressDO> getAddressList(Long userId) {
return selectListByUserIdAndType(userId, null);
return addressMapper.selectListByUserIdAndDefaulted(userId, null);
}
/**
* 获取默认地址
* @param userId
* @return
*/
@Override
public AddressDO getDefaultUserAddress(Long userId) {
return addressMapper.getDefaultUserAddress(userId);
List<AddressDO> addresses = addressMapper.selectListByUserIdAndDefaulted(userId, true);
return CollUtil.getFirst(addresses);
}
/**
* 根据类型获取地址列表
* @param userId
* @param type null则查询全部
* @return
*/
public List<AddressDO> selectListByUserIdAndType(Long userId, Integer type) {
return addressMapper.selectListByUserIdAndType(userId, type);
}
}

76
yudao-module-member/yudao-module-member-biz/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
View File

@ -5,20 +5,18 @@ import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreate
import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO;
import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import;
import javax.annotation.Resource;
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ADDRESS_NOT_EXISTS;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
/**
* {@link AddressServiceImpl} 的单元测试类
@ -40,7 +38,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
AppAddressCreateReqVO reqVO = randomPojo(AppAddressCreateReqVO.class);
// 调用
Long addressId = addressService.createAddress(getLoginUserId(), reqVO);
Long addressId = addressService.createAddress(randomLongId(), reqVO);
// 断言
assertNotNull(addressId);
// 校验记录的属性是否正确
@ -59,7 +57,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
});
// 调用
addressService.updateAddress(getLoginUserId(), reqVO);
addressService.updateAddress(dbAddress.getUserId(), reqVO);
// 校验是否更新正确
AddressDO address = addressMapper.selectById(reqVO.getId()); // 获取最新的
assertPojoEquals(reqVO, address);
@ -71,7 +69,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
AppAddressUpdateReqVO reqVO = randomPojo(AppAddressUpdateReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> addressService.updateAddress(getLoginUserId(), reqVO), ADDRESS_NOT_EXISTS);
assertServiceException(() -> addressService.updateAddress(randomLongId(), reqVO), ADDRESS_NOT_EXISTS);
}
@Test
@ -83,7 +81,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
Long id = dbAddress.getId();
// 调用
addressService.deleteAddress(getLoginUserId(), id);
addressService.deleteAddress(dbAddress.getUserId(), id);
// 校验数据不存在了
assertNull(addressMapper.selectById(id));
}
@ -94,67 +92,7 @@ public class AddressServiceImplTest extends BaseDbUnitTest {
Long id = randomLongId();
// 调用, 并断言异常
assertServiceException(() -> addressService.deleteAddress(getLoginUserId(), id), ADDRESS_NOT_EXISTS);
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void ins() {
// mock 数据
AddressDO dbAddress = randomPojo(AddressDO.class, o -> { // 等会查询到
o.setUserId(null);
o.setName(null);
o.setMobile(null);
o.setAreaCode(null);
o.setDetailAddress(null);
o.setType(null);
o.setCreateTime(null);
});
addressMapper.insert(dbAddress);
// 测试 userId 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setUserId(null)));
// 测试 name 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setName(null)));
// 测试 mobile 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setMobile(null)));
// 测试 areaCode 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setAreaCode(null)));
// 测试 detailAddress 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setDetailAddress(null)));
// 测试 type 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setType(null)));
// 测试 createTime 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setCreateTime(null)));
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetAddressList() {
// mock 数据
AddressDO dbAddress = randomPojo(AddressDO.class, o -> { // 等会查询到
o.setUserId(null);
o.setName(null);
o.setMobile(null);
o.setAreaCode(null);
o.setDetailAddress(null);
o.setType(null);
o.setCreateTime(null);
});
addressMapper.insert(dbAddress);
// 测试 userId 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setUserId(null)));
// 测试 name 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setName(null)));
// 测试 mobile 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setMobile(null)));
// 测试 areaCode 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setAreaCode(null)));
// 测试 detailAddress 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setDetailAddress(null)));
// 测试 type 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setType(null)));
// 测试 createTime 不匹配
addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setCreateTime(null)));
assertServiceException(() -> addressService.deleteAddress(randomLongId(), id), ADDRESS_NOT_EXISTS);
}
}

8
yudao-module-member/yudao-module-member-biz/src/test/resources/sql/create_tables.sql
View File

@ -35,15 +35,15 @@ CREATE TABLE IF NOT EXISTS "member_address" (
"user_id" bigint(20) NOT NULL,
"name" varchar(10) NOT NULL,
"mobile" varchar(20) NOT NULL,
"area_code" int(11) NOT NULL,
"area_id" bigint(20) NOT NULL,
"post_code" varchar(16) NOT NULL,
"detail_address" varchar(250) NOT NULL,
"type" tinyint(4) NOT NULL,
"defaulted" bit NOT NULL,
"create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
"creator" varchar(64) DEFAULT '',
"update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
"deleted" bit NOT NULL DEFAULT FALSE,
"updater" varchar(64) DEFAULT '',
"tenant_id" bigint(20) NOT NULL,
PRIMARY KEY ("id")
) COMMENT '用户收件地址';
) COMMENT '用户收件地址';