1.优化

@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
  */
  */
 @Api(tags = "会员地址管理")
 @Api(tags = "会员地址管理")
 @RestController
 @RestController
-@RequestMapping("/ucEngine/memberAddress")
+@RequestMapping("/ucEngine/api/memberAddress")
 @CrossOrigin
 @CrossOrigin
 @Slf4j
 @Slf4j
 public class MemberAddressController {
 public class MemberAddressController {

 package com.topdraw.business.module.member.domain;
 package com.topdraw.business.module.member.domain;
 
 
 
 
+import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.util.IdWorker;
 import com.topdraw.util.IdWorker;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 
 

@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
  */
  */
 @Api(tags = "会员属性管理")
 @Api(tags = "会员属性管理")
 @RestController
 @RestController
-@RequestMapping("/ucEngine/memberProfile")
+@RequestMapping("/ucEngine/api/memberProfile")
 @CrossOrigin
 @CrossOrigin
 @Slf4j
 @Slf4j
 public class MemberProfileController {
 public class MemberProfileController {

@@ -2,6 +2,7 @@ package com.topdraw.business.module.member.profile.service.impl;
 
 
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.domain.Member;
+import com.topdraw.business.module.member.domain.MemberBuilder;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import com.topdraw.business.module.member.profile.domain.MemberProfile;
 import com.topdraw.business.module.member.profile.domain.MemberProfileBuilder;
 import com.topdraw.business.module.member.profile.domain.MemberProfileBuilder;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.MemberService;

@@ -19,7 +19,7 @@ import io.swagger.annotations.*;
  */
  */
 @Api(tags = "相关人员管理")
 @Api(tags = "相关人员管理")
 @RestController
 @RestController
-@RequestMapping("/ucEngine/memberRelatedInfo")
+@RequestMapping("/ucEngine/api/memberRelatedInfo")
 @CrossOrigin
 @CrossOrigin
 @Slf4j
 @Slf4j
 public class MemberRelatedInfoController {
 public class MemberRelatedInfoController {

@@ -26,8 +26,7 @@ import java.util.Objects;
  */
  */
 @Api(tags = "会员管理")
 @Api(tags = "会员管理")
 @RestController
 @RestController
-//@RequestMapping("/ucEngine/api/member")
-@RequestMapping("/ucEngine/member")
+@RequestMapping("/ucEngine/api/member")
 @CrossOrigin
 @CrossOrigin
 @Slf4j
 @Slf4j
 public class MemberController {
 public class MemberController {

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
  */
  */
 @Api(tags = "会员vip历史管理")
 @Api(tags = "会员vip历史管理")
 @RestController
 @RestController
-@RequestMapping("/ucEngine/memberVipHistory")
+@RequestMapping("/ucEngine/api/memberVipHistory")
 public class MemberVipHistoryController {
 public class MemberVipHistoryController {
 
 
     @Autowired
     @Autowired

 package com.topdraw.business.module.member.viphistory.service.impl;
 package com.topdraw.business.module.member.viphistory.service.impl;
 
 
 
 
+import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
@@ -49,6 +50,7 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
+    @AsyncMqSend
     public void create(MemberVipHistory resources) {
     public void create(MemberVipHistory resources) {
         log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources);
         log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources);
         this.checkMember(resources);
         this.checkMember(resources);

@@ -34,7 +34,7 @@ public interface UserTvService {
      *
      *
      * @param resources
      * @param resources
      */
      */
-    void unbindPriorityMemberCode(UserTv resources);
+    UserTvDTO unbindPriorityMemberCode(UserTv resources);
 
 
     /**
     /**
      *
      *

@@ -104,20 +104,21 @@ public class UserTvServiceImpl implements UserTvService {
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public void unbindPriorityMemberCode(UserTv resources) {
-        UserTv UserTv = this.userTvRepository.findById(resources.getId()).orElseGet(UserTv::new);
-        ValidationUtil.isNull( UserTv.getId(),"UserTv","id",resources.getId());
-        UserTv.copy(resources);
-        this.userTvRepository.save(UserTv);
+    public UserTvDTO unbindPriorityMemberCode(UserTv resources) {
+        UserTv userTv = this.userTvRepository.findById(resources.getId()).orElseGet(UserTv::new);
+        ValidationUtil.isNull( userTv.getId(),"UserTv","id",resources.getId());
+        userTv.copy(resources);
+        UserTv _userTv = this.userTvRepository.save(userTv);
+        return this.userTvMapper.toDto(_userTv);
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long id) {
     public void delete(Long id) {
         Assert.notNull(id, "The given id must not be null!");
         Assert.notNull(id, "The given id must not be null!");
-        UserTv UserTv = this.userTvRepository.findById(id).orElseThrow(
+        UserTv userTv = this.userTvRepository.findById(id).orElseThrow(
                 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", UserTv.class, id), 1));
                 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", UserTv.class, id), 1));
-        this.userTvRepository.delete(UserTv);
+        this.userTvRepository.delete(userTv);
     }
     }
 
 
     @Override
     @Override

@@ -21,13 +21,13 @@ public interface UserWeixinService {
      * @param resources
      * @param resources
      * @return
      * @return
      */
      */
-    UserWeixin create(UserWeixin resources);
+    UserWeixinDTO create(UserWeixin resources);
 
 
     /**
     /**
      *
      *
      * @param resources
      * @param resources
      */
      */
-    void update(UserWeixin resources);
+    UserWeixinDTO update(UserWeixin resources);
 
 
     /**
     /**
      *
      *

@@ -37,19 +37,20 @@ public class UserWeixinServiceImpl implements UserWeixinService {
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public UserWeixin create(UserWeixin resources) {
+    public UserWeixinDTO create(UserWeixin resources) {
         UserWeixin build = UserWeixinBuilder.build(resources);
         UserWeixin build = UserWeixinBuilder.build(resources);
-        this.userWeixinRepository.save(build);
-        return resources;
+        UserWeixin userWeixin = this.userWeixinRepository.save(build);
+        return this.userWeixinMapper.toDto(userWeixin);
     }
     }
 
 
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public void update(UserWeixin resources) {
-        UserWeixin UserWeixin = this.userWeixinRepository.findById(resources.getId()).orElseGet(UserWeixin::new);
-        ValidationUtil.isNull( UserWeixin.getId(),"UserWeixin","id",resources.getId());
-        UserWeixin.copy(resources);
-        this.userWeixinRepository.save(UserWeixin);
+    public UserWeixinDTO update(UserWeixin resources) {
+        UserWeixin userWeixin = this.userWeixinRepository.findById(resources.getId()).orElseGet(UserWeixin::new);
+        ValidationUtil.isNull( userWeixin.getId(),"UserWeixin","id",resources.getId());
+        userWeixin.copy(resources);
+        UserWeixin _userWeixin = this.userWeixinRepository.save(userWeixin);
+        return this.userWeixinMapper.toDto(_userWeixin);
     }
     }
 
 
     @Override
     @Override

@@ -264,7 +264,6 @@ public class UserOperationController {
                     String nicknameEncode = Base64Util.encode(nicknameDecode);
                     String nicknameEncode = Base64Util.encode(nicknameDecode);
                     memberDTO.setNickname(nicknameEncode);
                     memberDTO.setNickname(nicknameEncode);
                 }
                 }
-
                 if (StringUtils.isNotBlank(headimgurl)) {
                 if (StringUtils.isNotBlank(headimgurl)) {
                     String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
                     String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
                     String imageEncode = Base64Util.encode(headimgurlDecode);
                     String imageEncode = Base64Util.encode(headimgurlDecode);
@@ -272,7 +271,7 @@ public class UserOperationController {
                     memberDTO.setAvatarUrl(StringUtils.isNotBlank(image) == true ? image:headimgurlDecode);
                     memberDTO.setAvatarUrl(StringUtils.isNotBlank(image) == true ? image:headimgurlDecode);
                 }
                 }
             }catch (Exception e) {
             }catch (Exception e) {
-                log.info("headimgurl , nickname ===>> encode error!");
+                log.info("头像解析失败！！！");
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
 
 

@@ -45,7 +45,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
     @Autowired
     @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
 
-    @AsyncMqSend
     @CachePut(key = "#resources.memberId")
     @CachePut(key = "#resources.memberId")
     @Override
     @Override
     public MemberDTO buyVip(BuyVipBean resources) {
     public MemberDTO buyVip(BuyVipBean resources) {
@@ -101,7 +100,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
         return memberDTO;
         return memberDTO;
     }
     }
 
 
-    @AsyncMqSend
     @Override
     @Override
     public void createVipHistory(MemberVipHistory memberVipHistory){
     public void createVipHistory(MemberVipHistory memberVipHistory){
         this.memberVipHistoryService.create(memberVipHistory);
         this.memberVipHistoryService.create(memberVipHistory);
@@ -166,7 +164,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
        return this.update(member);
        return this.update(member);
     }
     }
 
 
-    @AsyncMqSend
     @Override
     @Override
     public MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid) {
     public MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid) {
 
 
@@ -205,7 +202,7 @@ public class MemberOperationServiceImpl implements MemberOperationService {
             this.threadPoolTaskExecutor.execute(()->{
             this.threadPoolTaskExecutor.execute(()->{
                 Member member = new Member();
                 Member member = new Member();
                 BeanUtils.copyProperties(memberDTO1,member);
                 BeanUtils.copyProperties(memberDTO1,member);
-                this.memberService.update(member);
+                this.update(member);
             });
             });
 
 
             vip = memberDTO1.getVip();
             vip = memberDTO1.getVip();

@@ -37,6 +37,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
     }
     }
 
 
     @Override
     @Override
+    @AsyncMqSend
     public MemberProfile create(MemberProfile resources) {
     public MemberProfile create(MemberProfile resources) {
         return this.memberProfileService.create(resources);
         return this.memberProfileService.create(resources);
     }
     }
@@ -83,8 +84,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
         String memberCode = resources.getMemberCode();
         String memberCode = resources.getMemberCode();
         MemberDTO memberDTO = null;
         MemberDTO memberDTO = null;
         if (StringUtils.isEmpty(memberCode)) {
         if (StringUtils.isEmpty(memberCode)) {
-            Long memberId = resources.getMemberId();
-            memberDTO = this.memberOperationService.findById(memberId);
+            memberDTO = this.memberOperationService.findByCode(memberCode);
             resources.setMemberCode(memberDTO.getCode());
             resources.setMemberCode(memberDTO.getCode());
         }
         }
 
 

 package com.topdraw.business.process.service.impl.member;
 package com.topdraw.business.process.service.impl.member;
 
 
+import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.member.domain.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.domain.MemberRelatedInfo;
 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
@@ -29,16 +30,19 @@ public class MemberRelatedInfoOperationServiceImpl implements MemberRelatedInfoO
     }
     }
 
 
     @Override
     @Override
+    @AsyncMqSend
     public MemberRelatedInfoDTO create(MemberRelatedInfo resources) {
     public MemberRelatedInfoDTO create(MemberRelatedInfo resources) {
         return this.memberRelatedInfoService.create(resources);
         return this.memberRelatedInfoService.create(resources);
     }
     }
 
 
     @Override
     @Override
+    @AsyncMqSend
     public MemberRelatedInfoDTO update(MemberRelatedInfo resources) {
     public MemberRelatedInfoDTO update(MemberRelatedInfo resources) {
         return this.memberRelatedInfoService.update(resources);
         return this.memberRelatedInfoService.update(resources);
     }
     }
 
 
     @Override
     @Override
+    @AsyncMqSend
     public void delete(Long id) {
     public void delete(Long id) {
         this.memberRelatedInfoService.delete(id);
         this.memberRelatedInfoService.delete(id);
     }
     }