Commit 583d34a801e111b185f61f88a70a7ddb0ecf90d9

Authored by YunaiV
1 parent 1b192b50

code review:移除收件地址多余的方法

Showing 12 changed files with 27 additions and 396 deletions
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/AddressController.java
1 package cn.iocoder.yudao.module.member.controller.admin.address; 1 package cn.iocoder.yudao.module.member.controller.admin.address;
2 2
  3 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
  5 +import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
3 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO; 6 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
4 -import org.springframework.web.bind.annotation.*;  
5 -import javax.annotation.Resource;  
6 -import org.springframework.validation.annotation.Validated;  
7 -import org.springframework.security.access.prepost.PreAuthorize;  
8 -import io.swagger.v3.oas.annotations.tags.Tag;  
9 -import io.swagger.v3.oas.annotations.Parameter; 7 +import cn.iocoder.yudao.module.member.service.address.AddressService;
10 import io.swagger.v3.oas.annotations.Operation; 8 import io.swagger.v3.oas.annotations.Operation;
  9 +import io.swagger.v3.oas.annotations.Parameter;
  10 +import io.swagger.v3.oas.annotations.tags.Tag;
  11 +import org.springframework.security.access.prepost.PreAuthorize;
  12 +import org.springframework.validation.annotation.Validated;
  13 +import org.springframework.web.bind.annotation.GetMapping;
  14 +import org.springframework.web.bind.annotation.RequestMapping;
  15 +import org.springframework.web.bind.annotation.RequestParam;
  16 +import org.springframework.web.bind.annotation.RestController;
11 17
12 -import javax.validation.constraints.*;  
13 -import javax.validation.*;  
14 -import javax.servlet.http.*;  
15 -import java.util.*;  
16 -import java.io.IOException; 18 +import javax.annotation.Resource;
  19 +import java.util.List;
17 20
18 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
19 -import cn.iocoder.yudao.framework.common.pojo.CommonResult;  
20 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; 21 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
21 22
22 -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;  
23 -  
24 -import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;  
25 -import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.*;  
26 -  
27 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.*;  
28 -import cn.iocoder.yudao.module.member.convert.address.AddressConvert;  
29 -import cn.iocoder.yudao.module.member.service.address.AddressService;  
30 -  
31 @Tag(name = "管理后台 - 用户收件地址") 23 @Tag(name = "管理后台 - 用户收件地址")
32 @RestController 24 @RestController
33 @RequestMapping("/member/address") 25 @RequestMapping("/member/address")
@@ -37,66 +29,13 @@ public class AddressController { @@ -37,66 +29,13 @@ public class AddressController {
37 @Resource 29 @Resource
38 private AddressService addressService; 30 private AddressService addressService;
39 31
40 - @PostMapping("/create")  
41 - @Operation(summary = "创建用户收件地址")  
42 - @PreAuthorize("@ss.hasPermission('member:address:create')")  
43 - public CommonResult<Long> createAddress(@Valid @RequestBody AddressCreateReqVO createReqVO) {  
44 - return success(addressService.createAddress(createReqVO));  
45 - }  
46 -  
47 - @PutMapping("/update")  
48 - @Operation(summary = "更新用户收件地址")  
49 - @PreAuthorize("@ss.hasPermission('member:address:update')")  
50 - public CommonResult<Boolean> updateAddress(@Valid @RequestBody AddressUpdateReqVO updateReqVO) {  
51 - addressService.updateAddress(updateReqVO);  
52 - return success(true);  
53 - }  
54 -  
55 - @DeleteMapping("/delete")  
56 - @Operation(summary = "删除用户收件地址")  
57 - @Parameter(name = "id", description = "编号", required = true)  
58 - @PreAuthorize("@ss.hasPermission('member:address:delete')")  
59 - public CommonResult<Boolean> deleteAddress(@RequestParam("id") Long id) {  
60 - addressService.deleteAddress(id);  
61 - return success(true);  
62 - }  
63 -  
64 - @GetMapping("/get")  
65 - @Operation(summary = "获得用户收件地址")  
66 - @Parameter(name = "id", description = "编号", required = true, example = "1024")  
67 - @PreAuthorize("@ss.hasPermission('member:address:query')")  
68 - public CommonResult<AddressRespVO> getAddress(@RequestParam("id") Long id) {  
69 - MemberAddressDO address = addressService.getAddress(id);  
70 - return success(AddressConvert.INSTANCE.convert2(address));  
71 - }  
72 -  
73 @GetMapping("/list") 32 @GetMapping("/list")
74 @Operation(summary = "获得用户收件地址列表") 33 @Operation(summary = "获得用户收件地址列表")
75 - @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")  
76 - @PreAuthorize("@ss.hasPermission('member:address:query')")  
77 - public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("ids") Collection<Long> ids) {  
78 - List<MemberAddressDO> list = addressService.getAddressList(ids); 34 + @Parameter(name = "userId", description = "用户编号", required = true)
  35 + @PreAuthorize("@ss.hasPermission('member:user:query')")
  36 + public CommonResult<List<AddressRespVO>> getAddressList(@RequestParam("userId") Long userId) {
  37 + List<MemberAddressDO> list = addressService.getAddressList(userId);
79 return success(AddressConvert.INSTANCE.convertList2(list)); 38 return success(AddressConvert.INSTANCE.convertList2(list));
80 } 39 }
81 40
82 - @GetMapping("/page")  
83 - @Operation(summary = "获得用户收件地址分页")  
84 - @PreAuthorize("@ss.hasPermission('member:address:query')")  
85 - public CommonResult<PageResult<AddressRespVO>> getAddressPage(@Valid AddressPageReqVO pageVO) {  
86 - PageResult<MemberAddressDO> pageResult = addressService.getAddressPage(pageVO);  
87 - return success(AddressConvert.INSTANCE.convertPage(pageResult));  
88 - }  
89 -  
90 - @GetMapping("/export-excel")  
91 - @Operation(summary = "导出用户收件地址 Excel")  
92 - @PreAuthorize("@ss.hasPermission('member:address:export')")  
93 - @OperateLog(type = EXPORT)  
94 - public void exportAddressExcel(@Valid AddressExportReqVO exportReqVO,  
95 - HttpServletResponse response) throws IOException {  
96 - List<MemberAddressDO> list = addressService.getAddressList(exportReqVO);  
97 - // 导出 Excel  
98 - List<AddressExcelVO> datas = AddressConvert.INSTANCE.convertList02(list);  
99 - ExcelUtils.write(response, "用户收件地址.xls", "数据", AddressExcelVO.class, datas);  
100 - }  
101 -  
102 } 41 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressCreateReqVO.java deleted
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo;  
2 -  
3 -import lombok.*;  
4 -import java.util.*;  
5 -import io.swagger.v3.oas.annotations.media.Schema;  
6 -import javax.validation.constraints.*;  
7 -  
8 -@Schema(description = "管理后台 - 用户收件地址创建 Request VO")  
9 -@Data  
10 -@EqualsAndHashCode(callSuper = true)  
11 -@ToString(callSuper = true)  
12 -public class AddressCreateReqVO extends AddressBaseVO {  
13 -  
14 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressExcelVO.java deleted
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo;  
2 -  
3 -import io.swagger.v3.oas.annotations.media.Schema;  
4 -import lombok.*;  
5 -import java.util.*;  
6 -import java.time.LocalDateTime;  
7 -import java.time.LocalDateTime;  
8 -  
9 -import com.alibaba.excel.annotation.ExcelProperty;  
10 -  
11 -/**  
12 - * 用户收件地址 Excel VO  
13 - *  
14 - * @author 绮梦  
15 - */  
16 -@Data  
17 -public class AddressExcelVO {  
18 -  
19 - @ExcelProperty("收件地址编号")  
20 - private Long id;  
21 -  
22 - @ExcelProperty("收件人名称")  
23 - private String name;  
24 -  
25 - @ExcelProperty("手机号")  
26 - private String mobile;  
27 -  
28 - @ExcelProperty("地区编码")  
29 - private Long areaId;  
30 -  
31 - @ExcelProperty("收件详细地址")  
32 - private String detailAddress;  
33 -  
34 - @ExcelProperty("是否默认")  
35 - private Boolean defaultStatus;  
36 -  
37 - @ExcelProperty("创建时间")  
38 - private LocalDateTime createTime;  
39 -  
40 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressExportReqVO.java deleted
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo;  
2 -  
3 -import lombok.*;  
4 -import java.util.*;  
5 -import io.swagger.v3.oas.annotations.media.Schema;  
6 -import cn.iocoder.yudao.framework.common.pojo.PageParam;  
7 -import java.time.LocalDateTime;  
8 -import org.springframework.format.annotation.DateTimeFormat;  
9 -  
10 -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;  
11 -  
12 -@Schema(description = "管理后台 - 用户收件地址 Excel 导出 Request VO,参数和 AddressPageReqVO 是一致的")  
13 -@Data  
14 -public class AddressExportReqVO {  
15 -  
16 - @Schema(description = "用户编号", example = "20369")  
17 - private Long userId;  
18 -  
19 - @Schema(description = "收件人名称", example = "张三")  
20 - private String name;  
21 -  
22 - @Schema(description = "手机号")  
23 - private String mobile;  
24 -  
25 - @Schema(description = "地区编码", example = "15716")  
26 - private Long areaId;  
27 -  
28 - @Schema(description = "收件详细地址")  
29 - private String detailAddress;  
30 -  
31 - @Schema(description = "是否默认", example = "2")  
32 - private Boolean defaultStatus;  
33 -  
34 - @Schema(description = "创建时间")  
35 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)  
36 - private LocalDateTime[] createTime;  
37 -  
38 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressPageReqVO.java deleted
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo;  
2 -  
3 -import lombok.*;  
4 -import java.util.*;  
5 -import io.swagger.v3.oas.annotations.media.Schema;  
6 -import cn.iocoder.yudao.framework.common.pojo.PageParam;  
7 -import org.springframework.format.annotation.DateTimeFormat;  
8 -import java.time.LocalDateTime;  
9 -  
10 -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;  
11 -  
12 -@Schema(description = "管理后台 - 用户收件地址分页 Request VO")  
13 -@Data  
14 -@EqualsAndHashCode(callSuper = true)  
15 -@ToString(callSuper = true)  
16 -public class AddressPageReqVO extends PageParam {  
17 -  
18 - @Schema(description = "用户编号", example = "20369")  
19 - private Long userId;  
20 -  
21 - @Schema(description = "收件人名称", example = "张三")  
22 - private String name;  
23 -  
24 - @Schema(description = "手机号")  
25 - private String mobile;  
26 -  
27 - @Schema(description = "地区编码", example = "15716")  
28 - private Long areaId;  
29 -  
30 - @Schema(description = "收件详细地址")  
31 - private String detailAddress;  
32 -  
33 - @Schema(description = "是否默认", example = "2")  
34 - private Boolean defaultStatus;  
35 -  
36 - @Schema(description = "创建时间")  
37 - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)  
38 - private LocalDateTime[] createTime;  
39 -  
40 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/address/vo/AddressUpdateReqVO.java deleted
1 -package cn.iocoder.yudao.module.member.controller.admin.address.vo;  
2 -  
3 -import io.swagger.v3.oas.annotations.media.Schema;  
4 -import lombok.*;  
5 -import java.util.*;  
6 -import javax.validation.constraints.*;  
7 -  
8 -@Schema(description = "管理后台 - 用户收件地址更新 Request VO")  
9 -@Data  
10 -@EqualsAndHashCode(callSuper = true)  
11 -@ToString(callSuper = true)  
12 -public class AddressUpdateReqVO extends AddressBaseVO {  
13 -  
14 - @Schema(description = "收件地址编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "7380")  
15 - @NotNull(message = "收件地址编号不能为空")  
16 - private Long id;  
17 -  
18 -}  
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/user/vo/MemberUserBaseVO.java
@@ -40,10 +40,10 @@ public class MemberUserBaseVO { @@ -40,10 +40,10 @@ public class MemberUserBaseVO {
40 @Schema(description = "用户性别", example = "1") 40 @Schema(description = "用户性别", example = "1")
41 private Byte sex; 41 private Byte sex;
42 42
43 - @Schema(description = "所在地", example = "4371") 43 + @Schema(description = "所在地编号", example = "4371")
44 private Long areaId; 44 private Long areaId;
45 45
46 - @Schema(description = "所在地可视化显示", example = "4371") 46 + @Schema(description = "所在地全程", example = "上海上海市普陀区")
47 private String areaName; 47 private String areaName;
48 48
49 @Schema(description = "出生日期", example = "2023-03-12") 49 @Schema(description = "出生日期", example = "2023-03-12")
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/address/AddressConvert.java
1 package cn.iocoder.yudao.module.member.convert.address; 1 package cn.iocoder.yudao.module.member.convert.address;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils; 3 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
5 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO; 4 import cn.iocoder.yudao.module.member.api.address.dto.AddressRespDTO;
6 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressCreateReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressExcelVO;  
8 import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO; 5 import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressRespVO;
9 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressUpdateReqVO;  
10 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; 6 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
11 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressRespVO;
12 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; 8 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
@@ -44,15 +40,6 @@ public interface AddressConvert { @@ -44,15 +40,6 @@ public interface AddressConvert {
44 return AreaUtils.format(areaId); 40 return AreaUtils.format(areaId);
45 } 41 }
46 42
47 - MemberAddressDO convert(AddressCreateReqVO bean);  
48 -  
49 - MemberAddressDO convert(AddressUpdateReqVO bean);  
50 -  
51 - AddressRespVO convert2(MemberAddressDO bean);  
52 -  
53 List<AddressRespVO> convertList2(List<MemberAddressDO> list); 43 List<AddressRespVO> convertList2(List<MemberAddressDO> list);
54 44
55 - PageResult<AddressRespVO> convertPage(PageResult<MemberAddressDO> page);  
56 -  
57 - List<AddressExcelVO> convertList02(List<MemberAddressDO> list);  
58 } 45 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/convert/user/MemberUserConvert.java
1 package cn.iocoder.yudao.module.member.convert.user; 1 package cn.iocoder.yudao.module.member.convert.user;
2 2
3 -import cn.hutool.core.map.MapUtil;  
4 -import cn.hutool.core.util.StrUtil;  
5 import cn.iocoder.yudao.framework.common.pojo.PageResult; 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO; 4 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
7 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO; 5 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserRespVO;
8 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO; 6 import cn.iocoder.yudao.module.member.controller.admin.user.vo.MemberUserUpdateReqVO;
9 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO; 7 import cn.iocoder.yudao.module.member.controller.app.user.vo.AppMemberUserInfoRespVO;
  8 +import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
10 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO; 9 import cn.iocoder.yudao.module.member.dal.dataobject.group.MemberGroupDO;
11 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO; 10 import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
12 -import cn.iocoder.yudao.module.member.convert.address.AddressConvert;  
13 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO; 11 import cn.iocoder.yudao.module.member.dal.dataobject.tag.MemberTagDO;
14 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; 12 import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
15 import org.mapstruct.Mapper; 13 import org.mapstruct.Mapper;
@@ -37,7 +35,7 @@ public interface MemberUserConvert { @@ -37,7 +35,7 @@ public interface MemberUserConvert {
37 35
38 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page); 36 PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> page);
39 37
40 - @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName") 38 + @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
41 MemberUserRespVO convert03(MemberUserDO bean); 39 MemberUserRespVO convert03(MemberUserDO bean);
42 40
43 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult, 41 default PageResult<MemberUserRespVO> convertPage(PageResult<MemberUserDO> pageResult,
@@ -50,11 +48,11 @@ public interface MemberUserConvert { @@ -50,11 +48,11 @@ public interface MemberUserConvert {
50 Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName); 48 Map<Long, String> levelMap = convertMap(levels, MemberLevelDO::getId, MemberLevelDO::getName);
51 Map<Long, String> groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName); 49 Map<Long, String> groupMap = convertMap(groups, MemberGroupDO::getId, MemberGroupDO::getName);
52 // 填充关联数据 50 // 填充关联数据
53 - for (MemberUserRespVO vo : result.getList()) {  
54 - vo.setTagNames(convertList(vo.getTagIds(), tagMap::get));  
55 - vo.setLevelName(MapUtil.getStr(levelMap, vo.getLevelId(), StrUtil.EMPTY));  
56 - vo.setGroupName(MapUtil.getStr(groupMap, vo.getGroupId(), StrUtil.EMPTY));  
57 - } 51 + result.getList().forEach(user -> {
  52 + user.setTagNames(convertList(user.getTagIds(), tagMap::get));
  53 + user.setLevelName(levelMap.get(user.getLevelId()));
  54 + user.setGroupName(groupMap.get(user.getGroupId()));
  55 + });
58 return result; 56 return result;
59 } 57 }
60 58
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/address/AddressMapper.java
1 package cn.iocoder.yudao.module.member.dal.mysql.address; 1 package cn.iocoder.yudao.module.member.dal.mysql.address;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
5 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; 4 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
6 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressExportReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressPageReqVO;  
8 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO; 5 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
9 import org.apache.ibatis.annotations.Mapper; 6 import org.apache.ibatis.annotations.Mapper;
10 7
@@ -21,28 +18,5 @@ public interface AddressMapper extends BaseMapperX&lt;MemberAddressDO&gt; { @@ -21,28 +18,5 @@ public interface AddressMapper extends BaseMapperX&lt;MemberAddressDO&gt; {
21 return selectList(new LambdaQueryWrapperX<MemberAddressDO>().eq(MemberAddressDO::getUserId, userId) 18 return selectList(new LambdaQueryWrapperX<MemberAddressDO>().eq(MemberAddressDO::getUserId, userId)
22 .eqIfPresent(MemberAddressDO::getDefaultStatus, defaulted)); 19 .eqIfPresent(MemberAddressDO::getDefaultStatus, defaulted));
23 } 20 }
24 - default PageResult<MemberAddressDO> selectPage(AddressPageReqVO reqVO) {  
25 - return selectPage(reqVO, new LambdaQueryWrapperX<MemberAddressDO>()  
26 - .eqIfPresent(MemberAddressDO::getUserId, reqVO.getUserId())  
27 - .likeIfPresent(MemberAddressDO::getName, reqVO.getName())  
28 - .eqIfPresent(MemberAddressDO::getMobile, reqVO.getMobile())  
29 - .eqIfPresent(MemberAddressDO::getAreaId, reqVO.getAreaId())  
30 - .eqIfPresent(MemberAddressDO::getDetailAddress, reqVO.getDetailAddress())  
31 - .eqIfPresent(MemberAddressDO::getDefaultStatus, reqVO.getDefaultStatus())  
32 - .betweenIfPresent(MemberAddressDO::getCreateTime, reqVO.getCreateTime())  
33 - .orderByDesc(MemberAddressDO::getId));  
34 - }  
35 -  
36 - default List<MemberAddressDO> selectList(AddressExportReqVO reqVO) {  
37 - return selectList(new LambdaQueryWrapperX<MemberAddressDO>()  
38 - .eqIfPresent(MemberAddressDO::getUserId, reqVO.getUserId())  
39 - .likeIfPresent(MemberAddressDO::getName, reqVO.getName())  
40 - .eqIfPresent(MemberAddressDO::getMobile, reqVO.getMobile())  
41 - .eqIfPresent(MemberAddressDO::getAreaId, reqVO.getAreaId())  
42 - .eqIfPresent(MemberAddressDO::getDetailAddress, reqVO.getDetailAddress())  
43 - .eqIfPresent(MemberAddressDO::getDefaultStatus, reqVO.getDefaultStatus())  
44 - .betweenIfPresent(MemberAddressDO::getCreateTime, reqVO.getCreateTime())  
45 - .orderByDesc(MemberAddressDO::getId));  
46 - }  
47 21
48 } 22 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressService.java
1 package cn.iocoder.yudao.module.member.service.address; 1 package cn.iocoder.yudao.module.member.service.address;
2 2
3 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
4 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressCreateReqVO;  
5 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressExportReqVO;  
6 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressPageReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressUpdateReqVO;  
8 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; 3 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
9 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; 4 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
10 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO; 5 import cn.iocoder.yudao.module.member.dal.dataobject.address.MemberAddressDO;
11 6
12 import javax.validation.Valid; 7 import javax.validation.Valid;
13 -import java.util.Collection;  
14 import java.util.List; 8 import java.util.List;
15 9
16 /** 10 /**
@@ -70,57 +64,4 @@ public interface AddressService { @@ -70,57 +64,4 @@ public interface AddressService {
70 */ 64 */
71 MemberAddressDO getDefaultUserAddress(Long userId); 65 MemberAddressDO getDefaultUserAddress(Long userId);
72 66
73 - /**  
74 - * 创建用户收件地址  
75 - *  
76 - * @param createReqVO 创建信息  
77 - * @return 编号  
78 - */  
79 - Long createAddress(@Valid AddressCreateReqVO createReqVO);  
80 -  
81 - /**  
82 - * 更新用户收件地址  
83 - *  
84 - * @param updateReqVO 更新信息  
85 - */  
86 - void updateAddress(@Valid AddressUpdateReqVO updateReqVO);  
87 -  
88 - /**  
89 - * 删除用户收件地址  
90 - *  
91 - * @param id 编号  
92 - */  
93 - void deleteAddress(Long id);  
94 -  
95 - /**  
96 - * 获得用户收件地址  
97 - *  
98 - * @param id 编号  
99 - * @return 用户收件地址  
100 - */  
101 - MemberAddressDO getAddress(Long id);  
102 -  
103 - /**  
104 - * 获得用户收件地址列表  
105 - *  
106 - * @param ids 编号  
107 - * @return 用户收件地址列表  
108 - */  
109 - List<MemberAddressDO> getAddressList(Collection<Long> ids);  
110 -  
111 - /**  
112 - * 获得用户收件地址分页  
113 - *  
114 - * @param pageReqVO 分页查询  
115 - * @return 用户收件地址分页  
116 - */  
117 - PageResult<MemberAddressDO> getAddressPage(AddressPageReqVO pageReqVO);  
118 -  
119 - /**  
120 - * 获得用户收件地址列表, 用于 Excel 导出  
121 - *  
122 - * @param exportReqVO 查询条件  
123 - * @return 用户收件地址列表  
124 - */  
125 - List<MemberAddressDO> getAddressList(AddressExportReqVO exportReqVO);  
126 } 67 }
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/address/AddressServiceImpl.java
1 package cn.iocoder.yudao.module.member.service.address; 1 package cn.iocoder.yudao.module.member.service.address;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 -import cn.iocoder.yudao.framework.common.pojo.PageResult;  
5 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressCreateReqVO;  
6 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressExportReqVO;  
7 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressPageReqVO;  
8 -import cn.iocoder.yudao.module.member.controller.admin.address.vo.AddressUpdateReqVO;  
9 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO; 4 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressCreateReqVO;
10 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO; 5 import cn.iocoder.yudao.module.member.controller.app.address.vo.AppAddressUpdateReqVO;
11 import cn.iocoder.yudao.module.member.convert.address.AddressConvert; 6 import cn.iocoder.yudao.module.member.convert.address.AddressConvert;
@@ -16,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional; @@ -16,7 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
16 import org.springframework.validation.annotation.Validated; 11 import org.springframework.validation.annotation.Validated;
17 12
18 import javax.annotation.Resource; 13 import javax.annotation.Resource;
19 -import java.util.Collection;  
20 import java.util.List; 14 import java.util.List;
21 15
22 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; 16 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -100,56 +94,4 @@ public class AddressServiceImpl implements AddressService { @@ -100,56 +94,4 @@ public class AddressServiceImpl implements AddressService {
100 return CollUtil.getFirst(addresses); 94 return CollUtil.getFirst(addresses);
101 } 95 }
102 96
103 - @Override  
104 - public Long createAddress(AddressCreateReqVO createReqVO) {  
105 - // 插入  
106 - MemberAddressDO address = AddressConvert.INSTANCE.convert(createReqVO);  
107 - addressMapper.insert(address);  
108 - // 返回  
109 - return address.getId();  
110 - }  
111 -  
112 - @Override  
113 - public void updateAddress(AddressUpdateReqVO updateReqVO) {  
114 - // 校验存在  
115 - validateAddressExists(updateReqVO.getId());  
116 - // 更新  
117 - MemberAddressDO updateObj = AddressConvert.INSTANCE.convert(updateReqVO);  
118 - addressMapper.updateById(updateObj);  
119 - }  
120 -  
121 - @Override  
122 - public void deleteAddress(Long id) {  
123 - // 校验存在  
124 - validateAddressExists(id);  
125 - // 删除  
126 - addressMapper.deleteById(id);  
127 - }  
128 -  
129 - private void validateAddressExists(Long id) {  
130 - if (addressMapper.selectById(id) == null) {  
131 - throw exception(ADDRESS_NOT_EXISTS);  
132 - }  
133 - }  
134 -  
135 - @Override  
136 - public MemberAddressDO getAddress(Long id) {  
137 - return addressMapper.selectById(id);  
138 - }  
139 -  
140 - @Override  
141 - public List<MemberAddressDO> getAddressList(Collection<Long> ids) {  
142 - return addressMapper.selectBatchIds(ids);  
143 - }  
144 -  
145 - @Override  
146 - public PageResult<MemberAddressDO> getAddressPage(AddressPageReqVO pageReqVO) {  
147 - return addressMapper.selectPage(pageReqVO);  
148 - }  
149 -  
150 - @Override  
151 - public List<MemberAddressDO> getAddressList(AddressExportReqVO exportReqVO) {  
152 - return addressMapper.selectList(exportReqVO);  
153 - }  
154 -  
155 } 97 }