Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 63c0e7b2 63c0e7b2683b1a7b0c810122a62fb69b6cc4fb55 by xianghan
Options

1.优化

1 parent 1432c3cf
Inline Side-by-side
Showing 11 changed files with 80 additions and 28 deletions
...@@ -52,10 +52,10 @@ public class MemberAddressController { ...@@ -52,10 +52,10 @@ public class MemberAddressController {
52 } 52 }
53 53
54 @Log("删除会员地址") 54 @Log("删除会员地址")
55 @RequestMapping(value = "/delete/{id}") 55 @RequestMapping(value = "/delete")
56 @ApiOperation("删除会员地址") 56 @ApiOperation("删除会员地址")
57 @AnonymousAccess 57 @AnonymousAccess
58 public ResultInfo delete(@PathVariable(value = "id") Long resources) { 58 public ResultInfo delete(@RequestParam(value = "id") Long resources) {
59 log.info("memberAddress ==>> delete ==> param ==>> [{}]",resources); 59 log.info("memberAddress ==>> delete ==> param ==>> [{}]",resources);
60 this.memberAddressOperationService.delete(resources); 60 this.memberAddressOperationService.delete(resources);
61 return ResultInfo.success(); 61 return ResultInfo.success();
......
...@@ -68,12 +68,15 @@ public class MemberAddressServiceImpl implements MemberAddressService { ...@@ -68,12 +68,15 @@ public class MemberAddressServiceImpl implements MemberAddressService {
68 log.info("MemberAddressServiceImpl ==>> update ==>> param ==>> [{}]",resources); 68 log.info("MemberAddressServiceImpl ==>> update ==>> param ==>> [{}]",resources);
69 Assert.notNull(resources.getId(),"id can't be null"); 69 Assert.notNull(resources.getId(),"id can't be null");
70 try { 70 try {
71 this.redisUtils.doLock("MemberAddress::update::code" + resources.getId()); 71 this.redisUtils.doLock("MemberAddress::id" + resources.getId());
72 MemberDTO memberDTO = this.checkMember(resources);
73 resources.setMemberCode(memberDTO.getCode());
74 72
75 MemberAddress _memberAddress = this.memberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new); 73 MemberAddress _memberAddress = this.memberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new);
76 ValidationUtil.isNull( _memberAddress.getId(),"MemberAddress","id",resources.getId()); 74 ValidationUtil.isNull( _memberAddress.getId(),"MemberAddress","id",resources.getId());
75
76 resources.setMemberId(_memberAddress.getMemberId());
77 MemberDTO memberDTO = this.checkMember(resources);
78 resources.setMemberCode(memberDTO.getCode());
79
77 _memberAddress.copy(resources); 80 _memberAddress.copy(resources);
78 MemberAddress memberAddress = this.memberAddressRepository.save(_memberAddress); 81 MemberAddress memberAddress = this.memberAddressRepository.save(_memberAddress);
79 82
......
...@@ -61,7 +61,7 @@ public class MemberRelatedInfo extends AsyncMqModule implements Serializable { ...@@ -61,7 +61,7 @@ public class MemberRelatedInfo extends AsyncMqModule implements Serializable {
61 61
62 /** 生日 */ 62 /** 生日 */
63 @Column(name = "birthday") 63 @Column(name = "birthday")
64 private LocalDate birthday; 64 private String birthday;
65 65
66 /** 头像地址 */ 66 /** 头像地址 */
67 @Column(name = "avatar_url") 67 @Column(name = "avatar_url")
......
...@@ -33,7 +33,7 @@ public class MemberRelatedInfoBuilder { ...@@ -33,7 +33,7 @@ public class MemberRelatedInfoBuilder {
33 } 33 }
34 34
35 public static MemberRelatedInfo build(Long memberId , String memberCode , Long id , String name , Integer sex , 35 public static MemberRelatedInfo build(Long memberId , String memberCode , Long id , String name , Integer sex ,
36 String cellphone , String idCard, LocalDate birthday , String avatarUrl , Integer type){ 36 String cellphone , String idCard, String birthday , String avatarUrl , Integer type){
37 37
38 Assert.notNull(memberId, GlobeExceptionMsg.MEMBER_ID_IS_NULL); 38 Assert.notNull(memberId, GlobeExceptionMsg.MEMBER_ID_IS_NULL);
39 39
...@@ -47,7 +47,7 @@ public class MemberRelatedInfoBuilder { ...@@ -47,7 +47,7 @@ public class MemberRelatedInfoBuilder {
47 memberRelatedInfo.setCellphone(stringIsNull(cellphone)); 47 memberRelatedInfo.setCellphone(stringIsNull(cellphone));
48 memberRelatedInfo.setIdCard(StringUtils.isBlank(idCard)?"000000000000000000":idCard); 48 memberRelatedInfo.setIdCard(StringUtils.isBlank(idCard)?"000000000000000000":idCard);
49 49
50 memberRelatedInfo.setBirthday(Objects.isNull(birthday)? LocalDate.of(1990,01,01):birthday); 50 memberRelatedInfo.setBirthday(StringUtils.isBlank(birthday) == true? "1900-01-01" : birthday);
51 memberRelatedInfo.setAvatarUrl(stringIsNull(avatarUrl)); 51 memberRelatedInfo.setAvatarUrl(stringIsNull(avatarUrl));
52 52
53 memberRelatedInfo.setType(Objects.isNull(type)?DEFAULT_VALUE_0:type); 53 memberRelatedInfo.setType(Objects.isNull(type)?DEFAULT_VALUE_0:type);
......
...@@ -4,6 +4,8 @@ import com.topdraw.annotation.AnonymousAccess; ...@@ -4,6 +4,8 @@ import com.topdraw.annotation.AnonymousAccess;
4 import com.topdraw.aop.log.Log; 4 import com.topdraw.aop.log.Log;
5 import com.topdraw.business.module.common.validated.CreateGroup; 5 import com.topdraw.business.module.common.validated.CreateGroup;
6 import com.topdraw.business.module.common.validated.UpdateGroup; 6 import com.topdraw.business.module.common.validated.UpdateGroup;
7 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
8 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
7 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService; 9 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
8 import com.topdraw.common.ResultInfo; 10 import com.topdraw.common.ResultInfo;
9 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 11 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
...@@ -34,9 +36,9 @@ public class MemberRelatedInfoController { ...@@ -34,9 +36,9 @@ public class MemberRelatedInfoController {
34 public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberRelatedInfo resources) { 36 public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberRelatedInfo resources) {
35 log.info("memberRelatedInfo ==>> create ==>> resources ===>> [{}]",resources); 37 log.info("memberRelatedInfo ==>> create ==>> resources ===>> [{}]",resources);
36 38
37 this.memberRelatedInfoOperationService.create(resources); 39 BasicMemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoOperationService.create(resources);
38 40
39 return ResultInfo.success(); 41 return ResultInfo.success(memberRelatedInfoDTO);
40 } 42 }
41 43
42 @Log("修改相关人员") 44 @Log("修改相关人员")
...@@ -47,16 +49,16 @@ public class MemberRelatedInfoController { ...@@ -47,16 +49,16 @@ public class MemberRelatedInfoController {
47 49
48 log.info("memberRelatedInfo ==>> update ==>> resources ===>> [{}]",resources); 50 log.info("memberRelatedInfo ==>> update ==>> resources ===>> [{}]",resources);
49 51
50 this.memberRelatedInfoOperationService.update(resources); 52 BasicMemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoOperationService.update(resources);
51 return ResultInfo.success(); 53 return ResultInfo.success(memberRelatedInfoDTO);
52 } 54 }
53 55
54 56
55 @Log("删除相关人员") 57 @Log("删除相关人员")
56 @RequestMapping(value = "/delete/{id}") 58 @RequestMapping(value = "/delete")
57 @ApiOperation("删除相关人员") 59 @ApiOperation("删除相关人员")
58 @AnonymousAccess 60 @AnonymousAccess
59 public ResultInfo delete(@PathVariable(value = "id") Long resources) { 61 public ResultInfo delete(@RequestParam(value = "id") Long resources) {
60 log.info("memberRelatedInfo ==>> delete ==>> resources ===>> [{}]",resources); 62 log.info("memberRelatedInfo ==>> delete ==>> resources ===>> [{}]",resources);
61 this.memberRelatedInfoOperationService.delete(resources); 63 this.memberRelatedInfoOperationService.delete(resources);
62 log.info("memberRelatedInfo ==>> delete ==>> result ===>> [{}]",resources); 64 log.info("memberRelatedInfo ==>> delete ==>> result ===>> [{}]",resources);
......
1 package com.topdraw.business.module.member.relatedinfo.service.dto;
2
3 import lombok.Data;
4
5 import java.io.Serializable;
6 import java.sql.Timestamp;
7 import java.time.LocalDate;
8
9
10 /**
11 * @author XiangHan
12 * @date 2021-10-22
13 */
14 @Data
15 public class BasicMemberRelatedInfoDTO implements Serializable {
16
17 // ID
18 private Long id;
19
20 // 人物关系 0：子女；1：父母
21 private Integer type;
22
23 // 手机号
24 private String cellphone;
25
26 // 身份证号
27 private String idCard;
28
29 // 姓名
30 private String name;
31
32 // 性别 0：女；1：男；-1：未知
33 private Integer sex;
34
35 // 生日
36 private String birthday;
37
38 // 头像地址
39 private String avatarUrl;
40 }
...@@ -36,7 +36,7 @@ public class MemberRelatedInfoDTO implements Serializable { ...@@ -36,7 +36,7 @@ public class MemberRelatedInfoDTO implements Serializable {
36 private Integer sex; 36 private Integer sex;
37 37
38 // 生日 38 // 生日
39 private LocalDate birthday; 39 private String birthday;
40 40
41 // 头像地址 41 // 头像地址
42 private String avatarUrl; 42 private String avatarUrl;
......
...@@ -109,11 +109,13 @@ public class MemberRelatedInfoServiceImpl implements MemberRelatedInfoService { ...@@ -109,11 +109,13 @@ public class MemberRelatedInfoServiceImpl implements MemberRelatedInfoService {
109 log.info("MemberRelatedInfoServiceImpl ==>> update ==>> param ==>> [{}]",resources); 109 log.info("MemberRelatedInfoServiceImpl ==>> update ==>> param ==>> [{}]",resources);
110 this.redisUtils.doLock("memberRelatedInfo::update::id" + resources.getId()); 110 this.redisUtils.doLock("memberRelatedInfo::update::id" + resources.getId());
111 try { 111 try {
112 MemberRelatedInfo memberRelatedInfo = this.memberRelatedInfoRepository.findById(resources.getId()).orElseGet(MemberRelatedInfo::new);
113 ValidationUtil.isNull(memberRelatedInfo.getId(), "MemberRelatedInfo", "id", resources.getId());
112 114
115 resources.setMemberId(memberRelatedInfo.getMemberId());
113 this.checkMemberAndEncodeRealname(resources); 116 this.checkMemberAndEncodeRealname(resources);
114 117
115 MemberRelatedInfo memberRelatedInfo = this.memberRelatedInfoRepository.findById(resources.getId()).orElseGet(MemberRelatedInfo::new); 118
116 ValidationUtil.isNull(memberRelatedInfo.getId(), "MemberRelatedInfo", "id", resources.getId());
117 memberRelatedInfo.copy(resources); 119 memberRelatedInfo.copy(resources);
118 120
119 this.memberRelatedInfoRepository.save(memberRelatedInfo); 121 this.memberRelatedInfoRepository.save(memberRelatedInfo);
......
...@@ -4,8 +4,10 @@ import com.topdraw.aspect.AsyncMqSend; ...@@ -4,8 +4,10 @@ import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.business.module.member.domain.Member; 4 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 5 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
6 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService; 6 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
7 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
7 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 8 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
8 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService; 9 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
10 import org.springframework.beans.BeanUtils;
9 import org.springframework.beans.factory.annotation.Autowired; 11 import org.springframework.beans.factory.annotation.Autowired;
10 import org.springframework.stereotype.Service; 12 import org.springframework.stereotype.Service;
11 13
...@@ -30,19 +32,22 @@ public class MemberRelatedInfoOperationServiceImpl implements MemberRelatedInfoO ...@@ -30,19 +32,22 @@ public class MemberRelatedInfoOperationServiceImpl implements MemberRelatedInfoO
30 } 32 }
31 33
32 @Override 34 @Override
33 @AsyncMqSend 35 public BasicMemberRelatedInfoDTO create(MemberRelatedInfo resources) {
34 public MemberRelatedInfoDTO create(MemberRelatedInfo resources) { 36 MemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoService.create(resources);
35 return this.memberRelatedInfoService.create(resources); 37 BasicMemberRelatedInfoDTO basicMemberRelatedInfoDTO = new BasicMemberRelatedInfoDTO();
38 BeanUtils.copyProperties(memberRelatedInfoDTO, basicMemberRelatedInfoDTO);
39 return basicMemberRelatedInfoDTO;
36 } 40 }
37 41
38 @Override 42 @Override
39 @AsyncMqSend 43 public BasicMemberRelatedInfoDTO update(MemberRelatedInfo resources) {
40 public MemberRelatedInfoDTO update(MemberRelatedInfo resources) { 44 MemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoService.update(resources);
41 return this.memberRelatedInfoService.update(resources); 45 BasicMemberRelatedInfoDTO basicMemberRelatedInfoDTO = new BasicMemberRelatedInfoDTO();
46 BeanUtils.copyProperties(memberRelatedInfoDTO, basicMemberRelatedInfoDTO);
47 return basicMemberRelatedInfoDTO;
42 } 48 }
43 49
44 @Override 50 @Override
45 @AsyncMqSend
46 public void delete(Long id) { 51 public void delete(Long id) {
47 this.memberRelatedInfoService.delete(id); 52 this.memberRelatedInfoService.delete(id);
48 } 53 }
......
...@@ -2,6 +2,7 @@ package com.topdraw.business.process.service.member; ...@@ -2,6 +2,7 @@ package com.topdraw.business.process.service.member;
2 2
3 import com.topdraw.business.module.member.domain.Member; 3 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
5 import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
5 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO; 6 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
6 7
7 /** 8 /**
...@@ -21,13 +22,13 @@ public interface MemberRelatedInfoOperationService { ...@@ -21,13 +22,13 @@ public interface MemberRelatedInfoOperationService {
21 * 新增 22 * 新增
22 * @param resources 23 * @param resources
23 */ 24 */
24 MemberRelatedInfoDTO create(MemberRelatedInfo resources); 25 BasicMemberRelatedInfoDTO create(MemberRelatedInfo resources);
25 26
26 /** 27 /**
27 * 修改 28 * 修改
28 * @param resources 29 * @param resources
29 */ 30 */
30 MemberRelatedInfoDTO update(MemberRelatedInfo resources); 31 BasicMemberRelatedInfoDTO update(MemberRelatedInfo resources);
31 32
32 /** 33 /**
33 * 删除 34 * 删除
......
...@@ -27,7 +27,7 @@ public class MemberRelatedInfoControllerTest extends BaseTest { ...@@ -27,7 +27,7 @@ public class MemberRelatedInfoControllerTest extends BaseTest {
27 member.setIdCard("422827199208010713"); 27 member.setIdCard("422827199208010713");
28 member.setName("fdfd"); 28 member.setName("fdfd");
29 member.setSex(1); 29 member.setSex(1);
30 member.setBirthday(LocalDate.of(2021,8,23)); 30 member.setBirthday("1993-04-06");
31 member.setAvatarUrl("www.sougou.com"); 31 member.setAvatarUrl("www.sougou.com");
32 // member.setCreateTime(); 32 // member.setCreateTime();
33 // member.setUpdateTime(); 33 // member.setUpdateTime();
...@@ -46,7 +46,6 @@ public class MemberRelatedInfoControllerTest extends BaseTest { ...@@ -46,7 +46,6 @@ public class MemberRelatedInfoControllerTest extends BaseTest {
46 member.setIdCard("422827199208010713"); 46 member.setIdCard("422827199208010713");
47 member.setName("fdfd"); 47 member.setName("fdfd");
48 member.setSex(1); 48 member.setSex(1);
49 member.setBirthday(LocalDate.now());
50 member.setAvatarUrl("www.baidu.com"); 49 member.setAvatarUrl("www.baidu.com");
51 // member.setCreateTime(); 50 // member.setCreateTime();
52 // member.setUpdateTime(); 51 // member.setUpdateTime();
......