1.优化部分会员信息与会员属性逻辑

+ALTER TABLE `uc_user_tv`
+ADD COLUMN `vis_user_id` bigint(20) NULL DEFAULT NULL COMMENT 'vis_user表主键' AFTER `platform_account`;
\ No newline at end of file

@@ -6,6 +6,7 @@ import com.topdraw.business.module.common.validated.UpdateGroup;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.user.iptv.domain.UserTv;
+import com.topdraw.business.process.service.MemberOperationService;
 import com.topdraw.business.process.service.UserOperationService;
 import com.topdraw.common.ResultInfo;
 import io.swagger.annotations.Api;
@@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 public class MemberController {
 
     @Autowired
-    private MemberService memberService;
+    private MemberOperationService memberOperationService;
     @Autowired
     private UserOperationService userTvOperationService;
 
@@ -48,7 +49,7 @@ public class MemberController {
     @ApiOperation("手动修改vip")
     public ResultInfo doUpdateVipByCode(@Validated(value = {UpdateGroup.class}) @RequestBody Member resources) {
         log.info("member ==>> doUpdateVipByCode ==>> param ==>> [{}]",resources);
-        memberService.update(resources);
+        this.memberOperationService.update(resources);
         log.info("member ==>> doUpdateVipByCode ==>> result ==>> [{}]",resources);
         return ResultInfo.success();
     }

 package com.topdraw.business.module.member.service.impl;
 
-import com.topdraw.aspect.AsyncMqSend;
 import com.topdraw.business.module.member.domain.Member;
 import com.topdraw.business.module.member.domain.MemberBuilder;
 import com.topdraw.business.module.member.profile.service.MemberProfileService;
@@ -101,7 +100,6 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public Long create(Member resources) {
 
         Member member = MemberBuilder.build(resources);
@@ -117,7 +115,6 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public Member createAndReturnMember(Member resources) {
 
         this.create(MemberBuilder.build(resources));
@@ -128,7 +125,6 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void update(Member resources) {
 
         log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources);
@@ -160,7 +156,6 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @AsyncMqSend()
     public void doUpdateMemberPoints(Member resources) {
         RLock rLock = this.redissonClient.getLock("member::update::code" + resources.getId().toString());
         try {

@@ -7,20 +7,61 @@ import com.topdraw.business.process.domian.weixin.BuyVipBean;
 
 public interface MemberOperationService {
 
+    /**
+     *
+     * @param member
+     */
     void doUpdateMemberInfo(Member member);
 
+    /**
+     *
+     * @param member
+     */
     void doInsertMember(Member member);
 
+    /**
+     *
+     * @param memberId
+     * @return
+     */
     MemberDTO findById(Long memberId);
 
+    /**
+     *
+     * @param member
+     */
     void doUpdateMemberExp(Member member);
 
+    /**
+     *
+     * @param member
+     */
     void doUpdateMemberPoints(Member member);
 
+    /**
+     *
+     * @param member
+     */
     void doUpdateMemberCoupon(Member member);
 
+    /**
+     *
+     * @param memberId
+     * @param appid
+     * @return
+     */
     MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid);
 
+    /**
+     *
+     * @param buyVipBean
+     * @return
+     */
     MemberDTO buyVip(BuyVipBean buyVipBean);
 
+    /**
+     * 修改会员
+     * @param resources
+     */
+    void update(Member resources);
 }

@@ -75,23 +75,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
         memberDTO.setVip(vip1);
         memberDTO.setVipExpireTime(vipExpireTime);
 
-        /*if (){
-            //购买过  判断当前时间有没有过vip过期时间，没有过，失效时间加一年;    过了，当前时间加一年
-            //区分是当前vip续费  还是买新的vip
-            if (ObjectUtil.equal(vip1, memberDTO.getVip())) {
-                if (now.isBefore(vipExpireTime)) {
-                    LocalDateTime localDateTime = vipExpireTime.plusYears(1L);
-                    memberDTO.setVipExpireTime(localDateTime);
-                } else {
-                    LocalDateTime localDateTime = now.plusYears(1L);
-                    memberDTO.setVipExpireTime(localDateTime);
-                }
-            } else {
-                LocalDateTime localDateTime = now.plusYears(1L);
-                memberDTO.setVipExpireTime(localDateTime);
-            }
-        }*/
-
         Member member = new Member();
         BeanUtils.copyProperties(memberDTO,member);
         this.memberService.create(member);
@@ -107,6 +90,11 @@ public class MemberOperationServiceImpl implements MemberOperationService {
         return memberDTO;
     }
 
+    @Override
+    public void update(Member resources) {
+        this.memberService.update(resources);
+    }
+
     private UserWeixinDTO findWeiXinById(Long id) {
         UserWeixinDTO userWeixinDTO = this.userWeixinService.findById(id);
         if (Objects.isNull(userWeixinDTO)) {