1.优化

@@ -52,10 +52,10 @@ public class MemberAddressController {
     }
 
     @Log("删除会员地址")
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/delete")
     @ApiOperation("删除会员地址")
     @AnonymousAccess
-    public ResultInfo delete(@PathVariable(value = "id") Long resources) {
+    public ResultInfo delete(@RequestParam(value = "id") Long resources) {
         log.info("memberAddress ==>> delete ==> param  ==>> [{}]",resources);
         this.memberAddressOperationService.delete(resources);
         return ResultInfo.success();

@@ -68,12 +68,15 @@ public class MemberAddressServiceImpl implements MemberAddressService {
         log.info("MemberAddressServiceImpl ==>> update ==>> param ==>> [{}]",resources);
         Assert.notNull(resources.getId(),"id can't be null");
         try {
-            this.redisUtils.doLock("MemberAddress::update::code" + resources.getId());
-            MemberDTO memberDTO = this.checkMember(resources);
-            resources.setMemberCode(memberDTO.getCode());
+            this.redisUtils.doLock("MemberAddress::id" + resources.getId());
 
             MemberAddress _memberAddress = this.memberAddressRepository.findById(resources.getId()).orElseGet(MemberAddress::new);
             ValidationUtil.isNull( _memberAddress.getId(),"MemberAddress","id",resources.getId());
+
+            resources.setMemberId(_memberAddress.getMemberId());
+            MemberDTO memberDTO = this.checkMember(resources);
+            resources.setMemberCode(memberDTO.getCode());
+
             _memberAddress.copy(resources);
             MemberAddress memberAddress = this.memberAddressRepository.save(_memberAddress);
 

@@ -61,7 +61,7 @@ public class MemberRelatedInfo extends AsyncMqModule implements Serializable {
 
     /** 生日 */
     @Column(name = "birthday")
-    private LocalDate birthday;
+    private String birthday;
 
     /** 头像地址 */
     @Column(name = "avatar_url")

@@ -33,7 +33,7 @@ public class MemberRelatedInfoBuilder {
     }
 
     public static MemberRelatedInfo build(Long memberId , String memberCode , Long id , String name , Integer sex ,
-                                          String cellphone , String idCard, LocalDate birthday , String avatarUrl , Integer type){
+                                          String cellphone , String idCard, String birthday , String avatarUrl , Integer type){
 
         Assert.notNull(memberId, GlobeExceptionMsg.MEMBER_ID_IS_NULL);
 
@@ -47,7 +47,7 @@ public class MemberRelatedInfoBuilder {
         memberRelatedInfo.setCellphone(stringIsNull(cellphone));
         memberRelatedInfo.setIdCard(StringUtils.isBlank(idCard)?"000000000000000000":idCard);
 
-        memberRelatedInfo.setBirthday(Objects.isNull(birthday)? LocalDate.of(1990,01,01):birthday);
+        memberRelatedInfo.setBirthday(StringUtils.isBlank(birthday) == true? "1900-01-01" : birthday);
         memberRelatedInfo.setAvatarUrl(stringIsNull(avatarUrl));
 
         memberRelatedInfo.setType(Objects.isNull(type)?DEFAULT_VALUE_0:type);

@@ -4,6 +4,8 @@ import com.topdraw.annotation.AnonymousAccess;
 import com.topdraw.aop.log.Log;
 import com.topdraw.business.module.common.validated.CreateGroup;
 import com.topdraw.business.module.common.validated.UpdateGroup;
+import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
+import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
 import com.topdraw.common.ResultInfo;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
@@ -34,9 +36,9 @@ public class MemberRelatedInfoController {
     public ResultInfo create(@Validated(value = {CreateGroup.class}) @RequestBody MemberRelatedInfo resources) {
         log.info("memberRelatedInfo ==>> create ==>> resources ===>> [{}]",resources);
 
-        this.memberRelatedInfoOperationService.create(resources);
+        BasicMemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoOperationService.create(resources);
 
-        return ResultInfo.success();
+        return ResultInfo.success(memberRelatedInfoDTO);
     }
 
     @Log("修改相关人员")
@@ -47,16 +49,16 @@ public class MemberRelatedInfoController {
 
         log.info("memberRelatedInfo ==>> update ==>> resources ===>> [{}]",resources);
 
-        this.memberRelatedInfoOperationService.update(resources);
-        return ResultInfo.success();
+        BasicMemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoOperationService.update(resources);
+        return ResultInfo.success(memberRelatedInfoDTO);
     }
 
 
     @Log("删除相关人员")
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/delete")
     @ApiOperation("删除相关人员")
     @AnonymousAccess
-    public ResultInfo delete(@PathVariable(value = "id") Long resources) {
+    public ResultInfo delete(@RequestParam(value = "id") Long resources) {
         log.info("memberRelatedInfo ==>> delete ==>> resources ===>> [{}]",resources);
         this.memberRelatedInfoOperationService.delete(resources);
         log.info("memberRelatedInfo ==>> delete ==>> result ===>> [{}]",resources);

+package com.topdraw.business.module.member.relatedinfo.service.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.time.LocalDate;
+
+
+/**
+ * @author XiangHan
+ * @date 2021-10-22
+ */
+@Data
+public class BasicMemberRelatedInfoDTO implements Serializable {
+
+    // ID
+    private Long id;
+
+    // 人物关系 0：子女；1：父母
+    private Integer type;
+
+    // 手机号
+    private String cellphone;
+
+    // 身份证号
+    private String idCard;
+
+    // 姓名
+    private String name;
+
+    // 性别 0：女；1：男；-1：未知
+    private Integer sex;
+
+    // 生日
+    private String birthday;
+
+    // 头像地址
+    private String avatarUrl;
+}

@@ -36,7 +36,7 @@ public class MemberRelatedInfoDTO implements Serializable {
     private Integer sex;
 
     // 生日
-    private LocalDate birthday;
+    private String birthday;
 
     // 头像地址
     private String avatarUrl;

@@ -109,11 +109,13 @@ public class MemberRelatedInfoServiceImpl implements MemberRelatedInfoService {
         log.info("MemberRelatedInfoServiceImpl ==>> update ==>> param ==>> [{}]",resources);
         this.redisUtils.doLock("memberRelatedInfo::update::id" + resources.getId());
         try {
+            MemberRelatedInfo memberRelatedInfo = this.memberRelatedInfoRepository.findById(resources.getId()).orElseGet(MemberRelatedInfo::new);
+            ValidationUtil.isNull(memberRelatedInfo.getId(), "MemberRelatedInfo", "id", resources.getId());
 
+            resources.setMemberId(memberRelatedInfo.getMemberId());
             this.checkMemberAndEncodeRealname(resources);
 
-            MemberRelatedInfo memberRelatedInfo = this.memberRelatedInfoRepository.findById(resources.getId()).orElseGet(MemberRelatedInfo::new);
-            ValidationUtil.isNull(memberRelatedInfo.getId(), "MemberRelatedInfo", "id", resources.getId());
+
             memberRelatedInfo.copy(resources);
 
             this.memberRelatedInfoRepository.save(memberRelatedInfo);

@@ -4,8 +4,10 @@ import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
+import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
 import com.topdraw.business.process.service.member.MemberRelatedInfoOperationService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,19 +32,22 @@ public class MemberRelatedInfoOperationServiceImpl implements MemberRelatedInfoO
     }
 
     @Override
-    @AsyncMqSend
-    public MemberRelatedInfoDTO create(MemberRelatedInfo resources) {
-        return this.memberRelatedInfoService.create(resources);
+    public BasicMemberRelatedInfoDTO create(MemberRelatedInfo resources) {
+        MemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoService.create(resources);
+        BasicMemberRelatedInfoDTO basicMemberRelatedInfoDTO = new BasicMemberRelatedInfoDTO();
+        BeanUtils.copyProperties(memberRelatedInfoDTO, basicMemberRelatedInfoDTO);
+        return basicMemberRelatedInfoDTO;
     }
 
     @Override
-    @AsyncMqSend
-    public MemberRelatedInfoDTO update(MemberRelatedInfo resources) {
-        return this.memberRelatedInfoService.update(resources);
+    public BasicMemberRelatedInfoDTO update(MemberRelatedInfo resources) {
+        MemberRelatedInfoDTO memberRelatedInfoDTO = this.memberRelatedInfoService.update(resources);
+        BasicMemberRelatedInfoDTO basicMemberRelatedInfoDTO = new BasicMemberRelatedInfoDTO();
+        BeanUtils.copyProperties(memberRelatedInfoDTO, basicMemberRelatedInfoDTO);
+        return basicMemberRelatedInfoDTO;
     }
 
     @Override
-    @AsyncMqSend
     public void delete(Long id) {
         this.memberRelatedInfoService.delete(id);
     }

@@ -2,6 +2,7 @@ package com.topdraw.business.process.service.member;
 
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
+import com.topdraw.business.module.member.relatedinfo.service.dto.BasicMemberRelatedInfoDTO;
 import com.topdraw.business.module.member.relatedinfo.service.dto.MemberRelatedInfoDTO;
 
 /**
@@ -21,13 +22,13 @@ public interface MemberRelatedInfoOperationService {
      * 新增
      * @param resources
      */
-    MemberRelatedInfoDTO create(MemberRelatedInfo resources);
+    BasicMemberRelatedInfoDTO create(MemberRelatedInfo resources);
 
     /**
      * 修改
      * @param resources
      */
-    MemberRelatedInfoDTO update(MemberRelatedInfo resources);
+    BasicMemberRelatedInfoDTO update(MemberRelatedInfo resources);
 
     /**
      * 删除

@@ -27,7 +27,7 @@ public class MemberRelatedInfoControllerTest extends BaseTest {
         member.setIdCard("422827199208010713");
         member.setName("fdfd");
         member.setSex(1);
-        member.setBirthday(LocalDate.of(2021,8,23));
+        member.setBirthday("1993-04-06");
         member.setAvatarUrl("www.sougou.com");
 //        member.setCreateTime();
 //        member.setUpdateTime();
@@ -46,7 +46,6 @@ public class MemberRelatedInfoControllerTest extends BaseTest {
         member.setIdCard("422827199208010713");
         member.setName("fdfd");
         member.setSex(1);
-        member.setBirthday(LocalDate.now());
         member.setAvatarUrl("www.baidu.com");
 //        member.setCreateTime();
 //        member.setUpdateTime();