Commit 1deb04d2561891aab3efe610faf18aaf6f131b62
1 parent
9ae44336
用户收件地址代码生成
Showing
19 changed files
with
778 additions
and
2 deletions
yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/enums/ErrorCodeConstants.java
| ... | ... | @@ -21,4 +21,7 @@ public interface ErrorCodeConstants { |
| 21 | 21 | ErrorCode AUTH_TOKEN_EXPIRED = new ErrorCode(1004003004, "Token 已经过期"); |
| 22 | 22 | ErrorCode AUTH_THIRD_LOGIN_NOT_BIND = new ErrorCode(1004003005, "未绑定账号,需要进行绑定"); |
| 23 | 23 | |
| 24 | + // ========== 用户收件地址 1004004000 ========== | |
| 25 | + ErrorCode ADDRESS_NOT_EXISTS = new ErrorCode(1004004000, "用户收件地址不存在"); | |
| 26 | + | |
| 24 | 27 | } | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/AppAddressController.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.app.address; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.CommonResult; | |
| 4 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressPageReqVO; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO; | |
| 8 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; | |
| 9 | +import cn.iocoder.yudao.module.member.convert.address.AddressConvert; | |
| 10 | +import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO; | |
| 11 | +import cn.iocoder.yudao.module.member.service.address.AddressService; | |
| 12 | +import io.swagger.annotations.Api; | |
| 13 | +import io.swagger.annotations.ApiImplicitParam; | |
| 14 | +import io.swagger.annotations.ApiOperation; | |
| 15 | +import org.springframework.validation.annotation.Validated; | |
| 16 | +import org.springframework.web.bind.annotation.*; | |
| 17 | + | |
| 18 | +import javax.annotation.Resource; | |
| 19 | +import javax.validation.Valid; | |
| 20 | +import java.util.Collection; | |
| 21 | +import java.util.List; | |
| 22 | + | |
| 23 | +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; | |
| 24 | + | |
| 25 | +@Api(tags = "用户 APP - 用户收件地址") | |
| 26 | +@RestController | |
| 27 | +@RequestMapping("/member/address") | |
| 28 | +@Validated | |
| 29 | +public class AppAddressController { | |
| 30 | + | |
| 31 | + @Resource | |
| 32 | + private AddressService addressService; | |
| 33 | + | |
| 34 | + @PostMapping("/create") | |
| 35 | + @ApiOperation("创建用户收件地址") | |
| 36 | + | |
| 37 | + public CommonResult<Long> createAddress(@Valid @RequestBody AppAddressCreateReqVO createReqVO) { | |
| 38 | + return success(addressService.createAddress(createReqVO)); | |
| 39 | + } | |
| 40 | + | |
| 41 | + @PutMapping("/update") | |
| 42 | + @ApiOperation("更新用户收件地址") | |
| 43 | + | |
| 44 | + public CommonResult<Boolean> updateAddress(@Valid @RequestBody AppAddressUpdateReqVO updateReqVO) { | |
| 45 | + addressService.updateAddress(updateReqVO); | |
| 46 | + return success(true); | |
| 47 | + } | |
| 48 | + | |
| 49 | + @DeleteMapping("/delete") | |
| 50 | + @ApiOperation("删除用户收件地址") | |
| 51 | + @ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Long.class) | |
| 52 | + | |
| 53 | + public CommonResult<Boolean> deleteAddress(@RequestParam("id") Long id) { | |
| 54 | + addressService.deleteAddress(id); | |
| 55 | + return success(true); | |
| 56 | + } | |
| 57 | + | |
| 58 | + @GetMapping("/get") | |
| 59 | + @ApiOperation("获得用户收件地址") | |
| 60 | + @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class) | |
| 61 | + | |
| 62 | + public CommonResult<AppAddressRespVO> getAddress(@RequestParam("id") Long id) { | |
| 63 | + AddressDO address = addressService.getAddress(id); | |
| 64 | + return success(AddressConvert.INSTANCE.convert(address)); | |
| 65 | + } | |
| 66 | + | |
| 67 | + @GetMapping("/list") | |
| 68 | + @ApiOperation("获得用户收件地址列表") | |
| 69 | + @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class) | |
| 70 | + | |
| 71 | + public CommonResult<List<AppAddressRespVO>> getAddressList(@RequestParam("ids") Collection<Long> ids) { | |
| 72 | + List<AddressDO> list = addressService.getAddressList(ids); | |
| 73 | + return success(AddressConvert.INSTANCE.convertList(list)); | |
| 74 | + } | |
| 75 | + | |
| 76 | + @GetMapping("/page") | |
| 77 | + @ApiOperation("获得用户收件地址分页") | |
| 78 | + | |
| 79 | + public CommonResult<PageResult<AppAddressRespVO>> getAddressPage(@Valid AppAddressPageReqVO pageVO) { | |
| 80 | + PageResult<AddressDO> pageResult = addressService.getAddressPage(pageVO); | |
| 81 | + return success(AddressConvert.INSTANCE.convertPage(pageResult)); | |
| 82 | + } | |
| 83 | + | |
| 84 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/package-info.java deleted
| 1 | -package cn.iocoder.yudao.module.member.controller.app.address; |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressBaseVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.app.address.vo; | |
| 2 | + | |
| 3 | +import lombok.*; | |
| 4 | +import java.util.*; | |
| 5 | +import io.swagger.annotations.*; | |
| 6 | +import javax.validation.constraints.*; | |
| 7 | + | |
| 8 | +/** | |
| 9 | +* 用户收件地址 Base VO,提供给添加、修改、详细的子 VO 使用 | |
| 10 | +* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成 | |
| 11 | +*/ | |
| 12 | +@Data | |
| 13 | +public class AppAddressBaseVO { | |
| 14 | + | |
| 15 | + @ApiModelProperty(value = "用户编号", required = true) | |
| 16 | + @NotNull(message = "用户编号不能为空") | |
| 17 | + private Integer userId; | |
| 18 | + | |
| 19 | + @ApiModelProperty(value = "收件人名称", required = true) | |
| 20 | + @NotNull(message = "收件人名称不能为空") | |
| 21 | + private String name; | |
| 22 | + | |
| 23 | + @ApiModelProperty(value = "手机号", required = true) | |
| 24 | + @NotNull(message = "手机号不能为空") | |
| 25 | + private String mobile; | |
| 26 | + | |
| 27 | + @ApiModelProperty(value = "地区编码", required = true) | |
| 28 | + @NotNull(message = "地区编码不能为空") | |
| 29 | + private Integer areaCode; | |
| 30 | + | |
| 31 | + @ApiModelProperty(value = "收件详细地址", required = true) | |
| 32 | + @NotNull(message = "收件详细地址不能为空") | |
| 33 | + private String detailAddress; | |
| 34 | + | |
| 35 | + @ApiModelProperty(value = "地址类型", required = true) | |
| 36 | + @NotNull(message = "地址类型不能为空") | |
| 37 | + private Integer type; | |
| 38 | + | |
| 39 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressCreateReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.app.address.vo; | |
| 2 | + | |
| 3 | +import lombok.*; | |
| 4 | +import java.util.*; | |
| 5 | +import io.swagger.annotations.*; | |
| 6 | +import javax.validation.constraints.*; | |
| 7 | + | |
| 8 | +@ApiModel("用户 APP - 用户收件地址创建 Request VO") | |
| 9 | +@Data | |
| 10 | +@EqualsAndHashCode(callSuper = true) | |
| 11 | +@ToString(callSuper = true) | |
| 12 | +public class AppAddressCreateReqVO extends AppAddressBaseVO { | |
| 13 | + | |
| 14 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressExportReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.app.address.vo; | |
| 2 | + | |
| 3 | +import lombok.*; | |
| 4 | +import java.util.*; | |
| 5 | +import io.swagger.annotations.*; | |
| 6 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 7 | +import org.springframework.format.annotation.DateTimeFormat; | |
| 8 | + | |
| 9 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | + | |
| 11 | +@ApiModel(value = "用户 APP - 用户收件地址 Excel 导出 Request VO", description = "参数和 AddressPageReqVO 是一致的") | |
| 12 | +@Data | |
| 13 | +public class AppAddressExportReqVO { | |
| 14 | + | |
| 15 | + @ApiModelProperty(value = "用户编号") | |
| 16 | + private Integer userId; | |
| 17 | + | |
| 18 | + @ApiModelProperty(value = "收件人名称") | |
| 19 | + private String name; | |
| 20 | + | |
| 21 | + @ApiModelProperty(value = "手机号") | |
| 22 | + private String mobile; | |
| 23 | + | |
| 24 | + @ApiModelProperty(value = "地区编码") | |
| 25 | + private Integer areaCode; | |
| 26 | + | |
| 27 | + @ApiModelProperty(value = "收件详细地址") | |
| 28 | + private String detailAddress; | |
| 29 | + | |
| 30 | + @ApiModelProperty(value = "地址类型") | |
| 31 | + private Integer type; | |
| 32 | + | |
| 33 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 34 | + @ApiModelProperty(value = "开始创建时间") | |
| 35 | + private Date beginCreateTime; | |
| 36 | + | |
| 37 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 38 | + @ApiModelProperty(value = "结束创建时间") | |
| 39 | + private Date endCreateTime; | |
| 40 | + | |
| 41 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressPageReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.app.address.vo; | |
| 2 | + | |
| 3 | +import lombok.*; | |
| 4 | +import java.util.*; | |
| 5 | +import io.swagger.annotations.*; | |
| 6 | +import cn.iocoder.yudao.framework.common.pojo.PageParam; | |
| 7 | +import org.springframework.format.annotation.DateTimeFormat; | |
| 8 | + | |
| 9 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; | |
| 10 | + | |
| 11 | +@ApiModel("用户 APP - 用户收件地址分页 Request VO") | |
| 12 | +@Data | |
| 13 | +@EqualsAndHashCode(callSuper = true) | |
| 14 | +@ToString(callSuper = true) | |
| 15 | +public class AppAddressPageReqVO extends PageParam { | |
| 16 | + | |
| 17 | + @ApiModelProperty(value = "用户编号") | |
| 18 | + private Integer userId; | |
| 19 | + | |
| 20 | + @ApiModelProperty(value = "收件人名称") | |
| 21 | + private String name; | |
| 22 | + | |
| 23 | + @ApiModelProperty(value = "手机号") | |
| 24 | + private String mobile; | |
| 25 | + | |
| 26 | + @ApiModelProperty(value = "地区编码") | |
| 27 | + private Integer areaCode; | |
| 28 | + | |
| 29 | + @ApiModelProperty(value = "收件详细地址") | |
| 30 | + private String detailAddress; | |
| 31 | + | |
| 32 | + @ApiModelProperty(value = "地址类型") | |
| 33 | + private Integer type; | |
| 34 | + | |
| 35 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 36 | + @ApiModelProperty(value = "开始创建时间") | |
| 37 | + private Date beginCreateTime; | |
| 38 | + | |
| 39 | + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) | |
| 40 | + @ApiModelProperty(value = "结束创建时间") | |
| 41 | + private Date endCreateTime; | |
| 42 | + | |
| 43 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressRespVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.app.address.vo; | |
| 2 | + | |
| 3 | +import lombok.*; | |
| 4 | +import java.util.*; | |
| 5 | +import io.swagger.annotations.*; | |
| 6 | + | |
| 7 | +@ApiModel("用户 APP - 用户收件地址 Response VO") | |
| 8 | +@Data | |
| 9 | +@EqualsAndHashCode(callSuper = true) | |
| 10 | +@ToString(callSuper = true) | |
| 11 | +public class AppAddressRespVO extends AppAddressBaseVO { | |
| 12 | + | |
| 13 | + @ApiModelProperty(value = "编号", required = true) | |
| 14 | + private Long id; | |
| 15 | + | |
| 16 | + @ApiModelProperty(value = "创建时间", required = true) | |
| 17 | + private Date createTime; | |
| 18 | + | |
| 19 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/controller/app/address/vo/AppAddressUpdateReqVO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.controller.app.address.vo; | |
| 2 | + | |
| 3 | +import lombok.*; | |
| 4 | +import java.util.*; | |
| 5 | +import io.swagger.annotations.*; | |
| 6 | +import javax.validation.constraints.*; | |
| 7 | + | |
| 8 | +@ApiModel("用户 APP - 用户收件地址更新 Request VO") | |
| 9 | +@Data | |
| 10 | +@EqualsAndHashCode(callSuper = true) | |
| 11 | +@ToString(callSuper = true) | |
| 12 | +public class AppAddressUpdateReqVO extends AppAddressBaseVO { | |
| 13 | + | |
| 14 | + @ApiModelProperty(value = "编号", required = true) | |
| 15 | + @NotNull(message = "编号不能为空") | |
| 16 | + private Long id; | |
| 17 | + | |
| 18 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.convert.address; | |
| 2 | + | |
| 3 | +import java.util.*; | |
| 4 | + | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 6 | + | |
| 7 | +import org.mapstruct.Mapper; | |
| 8 | +import org.mapstruct.factory.Mappers; | |
| 9 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.*; | |
| 10 | +import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 用户收件地址 Convert | |
| 14 | + * | |
| 15 | + * @author 芋道源码 | |
| 16 | + */ | |
| 17 | +@Mapper | |
| 18 | +public interface AddressConvert { | |
| 19 | + | |
| 20 | + AddressConvert INSTANCE = Mappers.getMapper(AddressConvert.class); | |
| 21 | + | |
| 22 | + AddressDO convert(AppAddressCreateReqVO bean); | |
| 23 | + | |
| 24 | + AddressDO convert(AppAddressUpdateReqVO bean); | |
| 25 | + | |
| 26 | + AppAddressRespVO convert(AddressDO bean); | |
| 27 | + | |
| 28 | + List<AppAddressRespVO> convertList(List<AddressDO> list); | |
| 29 | + | |
| 30 | + PageResult<AppAddressRespVO> convertPage(PageResult<AddressDO> page); | |
| 31 | + | |
| 32 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/AddressDO.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.dataobject.address; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; | |
| 4 | +import cn.iocoder.yudao.module.member.enums.AddressTypeEnum; | |
| 5 | +import com.baomidou.mybatisplus.annotation.TableId; | |
| 6 | +import com.baomidou.mybatisplus.annotation.TableName; | |
| 7 | +import lombok.*; | |
| 8 | + | |
| 9 | +/** | |
| 10 | + * 用户收件地址 DO | |
| 11 | + * | |
| 12 | + * @author 芋道源码 | |
| 13 | + */ | |
| 14 | +@TableName("member_address") | |
| 15 | +@Data | |
| 16 | +@EqualsAndHashCode(callSuper = true) | |
| 17 | +@ToString(callSuper = true) | |
| 18 | +@Builder | |
| 19 | +@NoArgsConstructor | |
| 20 | +@AllArgsConstructor | |
| 21 | +public class AddressDO extends BaseDO { | |
| 22 | + | |
| 23 | + /** | |
| 24 | + * 编号 | |
| 25 | + */ | |
| 26 | + @TableId | |
| 27 | + private Long id; | |
| 28 | + /** | |
| 29 | + * 用户编号 | |
| 30 | + */ | |
| 31 | + private Integer userId; | |
| 32 | + /** | |
| 33 | + * 收件人名称 | |
| 34 | + */ | |
| 35 | + private String name; | |
| 36 | + /** | |
| 37 | + * 手机号 | |
| 38 | + */ | |
| 39 | + private String mobile; | |
| 40 | + /** | |
| 41 | + * 地区编码 | |
| 42 | + */ | |
| 43 | + private Integer areaCode; | |
| 44 | + /** | |
| 45 | + * 收件详细地址 | |
| 46 | + */ | |
| 47 | + private String detailAddress; | |
| 48 | + /** | |
| 49 | + * 地址类型,主要分为默认地址,和普通地址 | |
| 50 | + * | |
| 51 | + * 外键 {@link AddressTypeEnum} | |
| 52 | + */ | |
| 53 | + private Integer type; | |
| 54 | + | |
| 55 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/address/package-info.java deleted
| 1 | -package cn.iocoder.yudao.module.member.dal.dataobject.address; |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.dal.mysql.address; | |
| 2 | + | |
| 3 | +import java.util.*; | |
| 4 | + | |
| 5 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 6 | +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | |
| 7 | +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | |
| 8 | +import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO; | |
| 9 | +import org.apache.ibatis.annotations.Mapper; | |
| 10 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.*; | |
| 11 | + | |
| 12 | +/** | |
| 13 | + * 用户收件地址 Mapper | |
| 14 | + * | |
| 15 | + * @author 芋道源码 | |
| 16 | + */ | |
| 17 | +@Mapper | |
| 18 | +public interface AddressMapper extends BaseMapperX<AddressDO> { | |
| 19 | + | |
| 20 | + default PageResult<AddressDO> selectPage(AppAddressPageReqVO reqVO) { | |
| 21 | + return selectPage(reqVO, new LambdaQueryWrapperX<AddressDO>() | |
| 22 | + .eqIfPresent(AddressDO::getUserId, reqVO.getUserId()) | |
| 23 | + .likeIfPresent(AddressDO::getName, reqVO.getName()) | |
| 24 | + .eqIfPresent(AddressDO::getMobile, reqVO.getMobile()) | |
| 25 | + .eqIfPresent(AddressDO::getAreaCode, reqVO.getAreaCode()) | |
| 26 | + .eqIfPresent(AddressDO::getDetailAddress, reqVO.getDetailAddress()) | |
| 27 | + .eqIfPresent(AddressDO::getType, reqVO.getType()) | |
| 28 | + .betweenIfPresent(AddressDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) | |
| 29 | + .orderByDesc(AddressDO::getId)); | |
| 30 | + } | |
| 31 | + | |
| 32 | + default List<AddressDO> selectList(AppAddressExportReqVO reqVO) { | |
| 33 | + return selectList(new LambdaQueryWrapperX<AddressDO>() | |
| 34 | + .eqIfPresent(AddressDO::getUserId, reqVO.getUserId()) | |
| 35 | + .likeIfPresent(AddressDO::getName, reqVO.getName()) | |
| 36 | + .eqIfPresent(AddressDO::getMobile, reqVO.getMobile()) | |
| 37 | + .eqIfPresent(AddressDO::getAreaCode, reqVO.getAreaCode()) | |
| 38 | + .eqIfPresent(AddressDO::getDetailAddress, reqVO.getDetailAddress()) | |
| 39 | + .eqIfPresent(AddressDO::getType, reqVO.getType()) | |
| 40 | + .betweenIfPresent(AddressDO::getCreateTime, reqVO.getBeginCreateTime(), reqVO.getEndCreateTime()) | |
| 41 | + .orderByDesc(AddressDO::getId)); | |
| 42 | + } | |
| 43 | + | |
| 44 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/enums/AddressTypeEnum.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.enums; | |
| 2 | + | |
| 3 | +import lombok.AllArgsConstructor; | |
| 4 | +import lombok.Getter; | |
| 5 | + | |
| 6 | +/** | |
| 7 | + * 用户收件地址的类型枚举 | |
| 8 | + */ | |
| 9 | +@Getter | |
| 10 | +@AllArgsConstructor | |
| 11 | +public enum AddressTypeEnum { | |
| 12 | + | |
| 13 | + DEFAULT(1, "默认收件地址"), | |
| 14 | + NORMAL(2, "普通收件地址"), // 即非默认收件笛之爱 | |
| 15 | + | |
| 16 | + ; | |
| 17 | + | |
| 18 | + private final Integer type; | |
| 19 | + private final String desc; | |
| 20 | + | |
| 21 | +} | |
| 0 | 22 | \ No newline at end of file | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.address; | |
| 2 | + | |
| 3 | +import java.util.*; | |
| 4 | +import javax.validation.*; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.*; | |
| 6 | +import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO; | |
| 7 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 8 | + | |
| 9 | +/** | |
| 10 | + * 用户收件地址 Service 接口 | |
| 11 | + * | |
| 12 | + * @author 芋道源码 | |
| 13 | + */ | |
| 14 | +public interface AddressService { | |
| 15 | + | |
| 16 | + /** | |
| 17 | + * 创建用户收件地址 | |
| 18 | + * | |
| 19 | + * @param createReqVO 创建信息 | |
| 20 | + * @return 编号 | |
| 21 | + */ | |
| 22 | + Long createAddress(@Valid AppAddressCreateReqVO createReqVO); | |
| 23 | + | |
| 24 | + /** | |
| 25 | + * 更新用户收件地址 | |
| 26 | + * | |
| 27 | + * @param updateReqVO 更新信息 | |
| 28 | + */ | |
| 29 | + void updateAddress(@Valid AppAddressUpdateReqVO updateReqVO); | |
| 30 | + | |
| 31 | + /** | |
| 32 | + * 删除用户收件地址 | |
| 33 | + * | |
| 34 | + * @param id 编号 | |
| 35 | + */ | |
| 36 | + void deleteAddress(Long id); | |
| 37 | + | |
| 38 | + /** | |
| 39 | + * 获得用户收件地址 | |
| 40 | + * | |
| 41 | + * @param id 编号 | |
| 42 | + * @return 用户收件地址 | |
| 43 | + */ | |
| 44 | + AddressDO getAddress(Long id); | |
| 45 | + | |
| 46 | + /** | |
| 47 | + * 获得用户收件地址列表 | |
| 48 | + * | |
| 49 | + * @param ids 编号 | |
| 50 | + * @return 用户收件地址列表 | |
| 51 | + */ | |
| 52 | + List<AddressDO> getAddressList(Collection<Long> ids); | |
| 53 | + | |
| 54 | + /** | |
| 55 | + * 获得用户收件地址分页 | |
| 56 | + * | |
| 57 | + * @param pageReqVO 分页查询 | |
| 58 | + * @return 用户收件地址分页 | |
| 59 | + */ | |
| 60 | + PageResult<AddressDO> getAddressPage(AppAddressPageReqVO pageReqVO); | |
| 61 | + | |
| 62 | + /** | |
| 63 | + * 获得用户收件地址列表, 用于 Excel 导出 | |
| 64 | + * | |
| 65 | + * @param exportReqVO 查询条件 | |
| 66 | + * @return 用户收件地址列表 | |
| 67 | + */ | |
| 68 | + List<AddressDO> getAddressList(AppAddressExportReqVO exportReqVO); | |
| 69 | + | |
| 70 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.address; | |
| 2 | + | |
| 3 | +import org.springframework.stereotype.Service; | |
| 4 | +import javax.annotation.Resource; | |
| 5 | +import org.springframework.validation.annotation.Validated; | |
| 6 | + | |
| 7 | +import java.util.*; | |
| 8 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.*; | |
| 9 | +import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO; | |
| 10 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 11 | + | |
| 12 | +import cn.iocoder.yudao.module.member.convert.address.AddressConvert; | |
| 13 | +import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper; | |
| 14 | + | |
| 15 | +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; | |
| 16 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.*; | |
| 17 | + | |
| 18 | +/** | |
| 19 | + * 用户收件地址 Service 实现类 | |
| 20 | + * | |
| 21 | + * @author 芋道源码 | |
| 22 | + */ | |
| 23 | +@Service | |
| 24 | +@Validated | |
| 25 | +public class AddressServiceImpl implements AddressService { | |
| 26 | + | |
| 27 | + @Resource | |
| 28 | + private AddressMapper addressMapper; | |
| 29 | + | |
| 30 | + @Override | |
| 31 | + public Long createAddress(AppAddressCreateReqVO createReqVO) { | |
| 32 | + // 插入 | |
| 33 | + AddressDO address = AddressConvert.INSTANCE.convert(createReqVO); | |
| 34 | + addressMapper.insert(address); | |
| 35 | + // 返回 | |
| 36 | + return address.getId(); | |
| 37 | + } | |
| 38 | + | |
| 39 | + @Override | |
| 40 | + public void updateAddress(AppAddressUpdateReqVO updateReqVO) { | |
| 41 | + // 校验存在 | |
| 42 | + this.validateAddressExists(updateReqVO.getId()); | |
| 43 | + // 更新 | |
| 44 | + AddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO); | |
| 45 | + addressMapper.updateById(updateObj); | |
| 46 | + } | |
| 47 | + | |
| 48 | + @Override | |
| 49 | + public void deleteAddress(Long id) { | |
| 50 | + // 校验存在 | |
| 51 | + this.validateAddressExists(id); | |
| 52 | + // 删除 | |
| 53 | + addressMapper.deleteById(id); | |
| 54 | + } | |
| 55 | + | |
| 56 | + private void validateAddressExists(Long id) { | |
| 57 | + if (addressMapper.selectById(id) == null) { | |
| 58 | + throw exception(ADDRESS_NOT_EXISTS); | |
| 59 | + } | |
| 60 | + } | |
| 61 | + | |
| 62 | + @Override | |
| 63 | + public AddressDO getAddress(Long id) { | |
| 64 | + return addressMapper.selectById(id); | |
| 65 | + } | |
| 66 | + | |
| 67 | + @Override | |
| 68 | + public List<AddressDO> getAddressList(Collection<Long> ids) { | |
| 69 | + return addressMapper.selectBatchIds(ids); | |
| 70 | + } | |
| 71 | + | |
| 72 | + @Override | |
| 73 | + public PageResult<AddressDO> getAddressPage(AppAddressPageReqVO pageReqVO) { | |
| 74 | + return addressMapper.selectPage(pageReqVO); | |
| 75 | + } | |
| 76 | + | |
| 77 | + @Override | |
| 78 | + public List<AddressDO> getAddressList(AppAddressExportReqVO exportReqVO) { | |
| 79 | + return addressMapper.selectList(exportReqVO); | |
| 80 | + } | |
| 81 | + | |
| 82 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/test/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImplTest.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.member.service.address; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.common.pojo.PageResult; | |
| 4 | +import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; | |
| 5 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; | |
| 6 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressExportReqVO; | |
| 7 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressPageReqVO; | |
| 8 | +import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; | |
| 9 | +import cn.iocoder.yudao.module.member.dal.dataobject.address.AddressDO; | |
| 10 | +import cn.iocoder.yudao.module.member.dal.mysql.address.AddressMapper; | |
| 11 | +import org.junit.jupiter.api.Disabled; | |
| 12 | +import org.junit.jupiter.api.Test; | |
| 13 | +import org.springframework.context.annotation.Import; | |
| 14 | + | |
| 15 | +import javax.annotation.Resource; | |
| 16 | +import java.util.List; | |
| 17 | + | |
| 18 | +import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; | |
| 19 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | |
| 20 | +import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | |
| 21 | +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; | |
| 22 | +import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; | |
| 23 | +import static cn.iocoder.yudao.module.member.enums.ErrorCodeConstants.ADDRESS_NOT_EXISTS; | |
| 24 | +import static org.junit.jupiter.api.Assertions.*; | |
| 25 | + | |
| 26 | +/** | |
| 27 | +* {@link AddressServiceImpl} 的单元测试类 | |
| 28 | +* | |
| 29 | +* @author 芋道源码 | |
| 30 | +*/ | |
| 31 | +@Import(AddressServiceImpl.class) | |
| 32 | +public class AddressServiceImplTest extends BaseDbUnitTest { | |
| 33 | + | |
| 34 | + @Resource | |
| 35 | + private AddressServiceImpl addressService; | |
| 36 | + | |
| 37 | + @Resource | |
| 38 | + private AddressMapper addressMapper; | |
| 39 | + | |
| 40 | + @Test | |
| 41 | + public void testCreateAddress_success() { | |
| 42 | + // 准备参数 | |
| 43 | + AppAddressCreateReqVO reqVO = randomPojo(AppAddressCreateReqVO.class); | |
| 44 | + | |
| 45 | + // 调用 | |
| 46 | + Long addressId = addressService.createAddress(reqVO); | |
| 47 | + // 断言 | |
| 48 | + assertNotNull(addressId); | |
| 49 | + // 校验记录的属性是否正确 | |
| 50 | + AddressDO address = addressMapper.selectById(addressId); | |
| 51 | + assertPojoEquals(reqVO, address); | |
| 52 | + } | |
| 53 | + | |
| 54 | + @Test | |
| 55 | + public void testUpdateAddress_success() { | |
| 56 | + // mock 数据 | |
| 57 | + AddressDO dbAddress = randomPojo(AddressDO.class); | |
| 58 | + addressMapper.insert(dbAddress);// @Sql: 先插入出一条存在的数据 | |
| 59 | + // 准备参数 | |
| 60 | + AppAddressUpdateReqVO reqVO = randomPojo(AppAddressUpdateReqVO.class, o -> { | |
| 61 | + o.setId(dbAddress.getId()); // 设置更新的 ID | |
| 62 | + }); | |
| 63 | + | |
| 64 | + // 调用 | |
| 65 | + addressService.updateAddress(reqVO); | |
| 66 | + // 校验是否更新正确 | |
| 67 | + AddressDO address = addressMapper.selectById(reqVO.getId()); // 获取最新的 | |
| 68 | + assertPojoEquals(reqVO, address); | |
| 69 | + } | |
| 70 | + | |
| 71 | + @Test | |
| 72 | + public void testUpdateAddress_notExists() { | |
| 73 | + // 准备参数 | |
| 74 | + AppAddressUpdateReqVO reqVO = randomPojo(AppAddressUpdateReqVO.class); | |
| 75 | + | |
| 76 | + // 调用, 并断言异常 | |
| 77 | + assertServiceException(() -> addressService.updateAddress(reqVO), ADDRESS_NOT_EXISTS); | |
| 78 | + } | |
| 79 | + | |
| 80 | + @Test | |
| 81 | + public void testDeleteAddress_success() { | |
| 82 | + // mock 数据 | |
| 83 | + AddressDO dbAddress = randomPojo(AddressDO.class); | |
| 84 | + addressMapper.insert(dbAddress);// @Sql: 先插入出一条存在的数据 | |
| 85 | + // 准备参数 | |
| 86 | + Long id = dbAddress.getId(); | |
| 87 | + | |
| 88 | + // 调用 | |
| 89 | + addressService.deleteAddress(id); | |
| 90 | + // 校验数据不存在了 | |
| 91 | + assertNull(addressMapper.selectById(id)); | |
| 92 | + } | |
| 93 | + | |
| 94 | + @Test | |
| 95 | + public void testDeleteAddress_notExists() { | |
| 96 | + // 准备参数 | |
| 97 | + Long id = randomLongId(); | |
| 98 | + | |
| 99 | + // 调用, 并断言异常 | |
| 100 | + assertServiceException(() -> addressService.deleteAddress(id), ADDRESS_NOT_EXISTS); | |
| 101 | + } | |
| 102 | + | |
| 103 | + @Test | |
| 104 | + @Disabled // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解 | |
| 105 | + public void ins() { | |
| 106 | + // mock 数据 | |
| 107 | + AddressDO dbAddress = randomPojo(AddressDO.class, o -> { // 等会查询到 | |
| 108 | + o.setUserId(null); | |
| 109 | + o.setName(null); | |
| 110 | + o.setMobile(null); | |
| 111 | + o.setAreaCode(null); | |
| 112 | + o.setDetailAddress(null); | |
| 113 | + o.setType(null); | |
| 114 | + o.setCreateTime(null); | |
| 115 | + }); | |
| 116 | + addressMapper.insert(dbAddress); | |
| 117 | + // 测试 userId 不匹配 | |
| 118 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setUserId(null))); | |
| 119 | + // 测试 name 不匹配 | |
| 120 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setName(null))); | |
| 121 | + // 测试 mobile 不匹配 | |
| 122 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setMobile(null))); | |
| 123 | + // 测试 areaCode 不匹配 | |
| 124 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setAreaCode(null))); | |
| 125 | + // 测试 detailAddress 不匹配 | |
| 126 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setDetailAddress(null))); | |
| 127 | + // 测试 type 不匹配 | |
| 128 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setType(null))); | |
| 129 | + // 测试 createTime 不匹配 | |
| 130 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setCreateTime(null))); | |
| 131 | + // 准备参数 | |
| 132 | + AppAddressPageReqVO reqVO = new AppAddressPageReqVO(); | |
| 133 | + reqVO.setUserId(null); | |
| 134 | + reqVO.setName(null); | |
| 135 | + reqVO.setMobile(null); | |
| 136 | + reqVO.setAreaCode(null); | |
| 137 | + reqVO.setDetailAddress(null); | |
| 138 | + reqVO.setType(null); | |
| 139 | + reqVO.setBeginCreateTime(null); | |
| 140 | + reqVO.setEndCreateTime(null); | |
| 141 | + | |
| 142 | + // 调用 | |
| 143 | + PageResult<AddressDO> pageResult = addressService.getAddressPage(reqVO); | |
| 144 | + // 断言 | |
| 145 | + assertEquals(1, pageResult.getTotal()); | |
| 146 | + assertEquals(1, pageResult.getList().size()); | |
| 147 | + assertPojoEquals(dbAddress, pageResult.getList().get(0)); | |
| 148 | + } | |
| 149 | + | |
| 150 | + @Test | |
| 151 | + @Disabled // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解 | |
| 152 | + public void testGetAddressList() { | |
| 153 | + // mock 数据 | |
| 154 | + AddressDO dbAddress = randomPojo(AddressDO.class, o -> { // 等会查询到 | |
| 155 | + o.setUserId(null); | |
| 156 | + o.setName(null); | |
| 157 | + o.setMobile(null); | |
| 158 | + o.setAreaCode(null); | |
| 159 | + o.setDetailAddress(null); | |
| 160 | + o.setType(null); | |
| 161 | + o.setCreateTime(null); | |
| 162 | + }); | |
| 163 | + addressMapper.insert(dbAddress); | |
| 164 | + // 测试 userId 不匹配 | |
| 165 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setUserId(null))); | |
| 166 | + // 测试 name 不匹配 | |
| 167 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setName(null))); | |
| 168 | + // 测试 mobile 不匹配 | |
| 169 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setMobile(null))); | |
| 170 | + // 测试 areaCode 不匹配 | |
| 171 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setAreaCode(null))); | |
| 172 | + // 测试 detailAddress 不匹配 | |
| 173 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setDetailAddress(null))); | |
| 174 | + // 测试 type 不匹配 | |
| 175 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setType(null))); | |
| 176 | + // 测试 createTime 不匹配 | |
| 177 | + addressMapper.insert(cloneIgnoreId(dbAddress, o -> o.setCreateTime(null))); | |
| 178 | + // 准备参数 | |
| 179 | + AppAddressExportReqVO reqVO = new AppAddressExportReqVO(); | |
| 180 | + reqVO.setUserId(null); | |
| 181 | + reqVO.setName(null); | |
| 182 | + reqVO.setMobile(null); | |
| 183 | + reqVO.setAreaCode(null); | |
| 184 | + reqVO.setDetailAddress(null); | |
| 185 | + reqVO.setType(null); | |
| 186 | + reqVO.setBeginCreateTime(null); | |
| 187 | + reqVO.setEndCreateTime(null); | |
| 188 | + | |
| 189 | + // 调用 | |
| 190 | + List<AddressDO> list = addressService.getAddressList(reqVO); | |
| 191 | + // 断言 | |
| 192 | + assertEquals(1, list.size()); | |
| 193 | + assertPojoEquals(dbAddress, list.get(0)); | |
| 194 | + } | |
| 195 | + | |
| 196 | +} | ... | ... |
yudao-module-member/yudao-module-member-impl/src/test/resources/sql/clean.sql
yudao-module-member/yudao-module-member-impl/src/test/resources/sql/create_tables.sql
| ... | ... | @@ -30,3 +30,19 @@ CREATE TABLE IF NOT EXISTS "inf_file" ( |
| 30 | 30 | PRIMARY KEY ("id") |
| 31 | 31 | ) COMMENT '文件表'; |
| 32 | 32 | |
| 33 | +CREATE TABLE IF NOT EXISTS "member_address" ( | |
| 34 | + "id" bigint(20) NOT NULL GENERATED BY DEFAULT AS IDENTITY, | |
| 35 | + "user_id" int(11) NOT NULL, | |
| 36 | + "name" varchar(10) NOT NULL, | |
| 37 | + "mobile" varchar(20) NOT NULL, | |
| 38 | + "area_code" int(11) NOT NULL, | |
| 39 | + "detail_address" varchar(250) NOT NULL, | |
| 40 | + "type" tinyint(4) NOT NULL, | |
| 41 | + "create_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, | |
| 42 | + "creator" varchar(64) DEFAULT '', | |
| 43 | + "update_time" datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, | |
| 44 | + "deleted" bit NOT NULL DEFAULT FALSE, | |
| 45 | + "updater" varchar(64) DEFAULT '', | |
| 46 | + PRIMARY KEY ("id") | |
| 47 | + ) COMMENT '用户收件地址'; | |
| 48 | + | ... | ... |