1.同步master，优化警告信息

@@ -43,4 +43,15 @@ public interface MemberRepository extends JpaRepository<Member, Long>, JpaSpecif
             " WHERE `id` = :#{#resources.id}", nativeQuery = true)
     void doUpdateMemberCoupon(@Param("resources") Member member);
 
+    @Modifying
+    @Query(value = "UPDATE `uc_member` SET `avatar_url` = :#{#resources.avatarUrl}, `update_time` = now() , " +
+            " `nickname`= :#{#resources.nickname}, " +
+            " `gender`=:#{#resources.gender} WHERE `id` = :#{#resources.id}", nativeQuery = true)
+    Integer updateMemberAvatarUrlAndNicknameAndGender(@Param("resources") Member resources);
+
+    @Modifying
+    @Query(value = "UPDATE `uc_member` SET `vip` = :#{#resources.vip}, " +
+            "`vip_expire_time` = :#{#resources.vipExpireTime} , `update_time`= now() " +
+            " WHERE `id` = :#{#resources.id}", nativeQuery = true)
+    Integer updateMemberVipAndVipExpireTime(@Param("resources") Member member);
 }

@@ -12,7 +12,12 @@ import java.util.List;
  */
 public interface MemberService {
 
-
+    /**
+     *
+     * @param member
+     * @return
+     */
+    MemberDTO doUpdateMemberVipAndVipExpireTime(Member member);
 
     /**
      * 根据ID查询
@@ -36,30 +41,23 @@ public interface MemberService {
     MemberDTO create(Member resources);
 
     /**
-     * 创建并返回会员
-     * @param resources 会员
-     * @return Member
-     */
-    MemberDTO createAndReturnMember(Member resources);
-
-    /**
      * 修改会员
      * @param resources
      */
     MemberDTO update(Member resources);
 
     /**
-     * 修改会员积分
-     * @param member 会员
+     *
+     * @param resources
+     * @return
      */
-    MemberDTO doUpdateMemberPoints(Member member);
+    MemberDTO doUpdateMemberAvatarUrlAndNicknameAndGender(Member resources);
 
     /**
-     * 查询绑定了大屏会员列表
-     * @param id 条件参数
-     * @return Map<String,Object>
+     * 修改会员积分
+     * @param resources 会员
      */
-    List<MemberDTO> findByUserIptvId(Long id);
+    MemberDTO doUpdateMemberPoints(Member resources);
 
     /**
      * 检查会员信息

@@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -46,6 +45,20 @@ public class MemberServiceImpl implements MemberService {
 
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MemberDTO doUpdateMemberVipAndVipExpireTime(Member resource) {
+        log.info("修改会员vip和vip过期时间 ==>> {}", resource);
+
+        Integer count = this.memberRepository.updateMemberVipAndVipExpireTime(resource);
+        if (Objects.nonNull(count) && count > 0) {
+            Member member = this.memberRepository.findById(resource.getId()).orElseGet(Member::new);
+            return this.memberMapper.toDto(member);
+        }
+
+        return this.memberMapper.toDto(resource);
+    }
+
+    @Override
     public MemberDTO findById(Long id) {
         Member member = this.memberRepository.findById(id).orElseGet(Member::new);
         ValidationUtil.isNull(member.getId(),"Member","id",id);
@@ -56,31 +69,18 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     public MemberDTO findByCode(String code) {
-
         Member member = this.memberRepository.findFirstByCode(code).orElseGet(Member::new);
-
         return this.memberMapper.toDto(member);
     }
 
     private MemberDTO findByIdOrCode(Long id, String code) {
-
         Member member = this.memberRepository.findByIdOrCode(id,code).orElseGet(Member::new);
         ValidationUtil.isNull(member.getId(),"Member","param",code);
-
         return this.memberMapper.toDto(member);
 
     }
 
     @Override
-    public List<MemberDTO> findByUserIptvId(Long id) {
-
-        List<Member> memberList = this.memberRepository.findByUserIptvId(id);
-
-        return this.memberMapper.toDto(memberList);
-
-    }
-
-    @Override
     public MemberDTO checkMember(Long id, String memberCode) {
 
         if(Objects.isNull(id) && StringUtils.isBlank(memberCode))
@@ -151,16 +151,6 @@ public class MemberServiceImpl implements MemberService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public MemberDTO createAndReturnMember(Member resources) {
-
-        MemberDTO memberDTO = this.create(MemberBuilder.build(resources));
-
-        return memberDTO;
-
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
     public void unbind(Member resources) {
         try {
             String code = resources.getCode();
@@ -224,6 +214,17 @@ public class MemberServiceImpl implements MemberService {
 
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public MemberDTO doUpdateMemberAvatarUrlAndNicknameAndGender(Member resources) {
+        Integer count = this.memberRepository.updateMemberAvatarUrlAndNicknameAndGender(resources);
+        if (Objects.nonNull(count) && count > 0) {
+            Member member = this.memberRepository.findById(resources.getId()).orElseGet(Member::new);
+            return this.memberMapper.toDto(member);
+        }
+        return this.memberMapper.toDto(resources);
+    }
+
     public Member save(Member member){
         return this.memberRepository.save(member);
     }

@@ -17,6 +17,9 @@ public class MemberVipHistoryDTO implements Serializable {
     // 主键
     private Long id;
 
+    //
+    private String memberCode;
+
     // 会员id
     private Long memberId;
 

@@ -49,7 +49,12 @@ public class PointsOperationServiceImpl implements PointsOperationService {
     ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
     public void asyncMemberPoint(Member member) {
+        log.info("修改会员积分,参数 =>> {}", member);
         String code = member.getCode();
+        if (StringUtils.isBlank(code)) {
+            log.error("修改会员积分失败，参数错误，会员code为空");
+            return;
+        }
         MemberDTO memberDTO = this.memberService.findByCode(code);
         member.setId(memberDTO.getId());
         this.memberService.doUpdateMemberPoints(member);

@@ -8,9 +8,12 @@ import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
+import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
 import com.topdraw.business.process.service.member.MemberOperationService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -23,6 +26,7 @@ import java.util.Objects;
 
 @Service
 //@CacheConfig(cacheNames = "member")
+@Slf4j
 public class MemberOperationServiceImpl implements MemberOperationService {
 
     @Autowired
@@ -36,14 +40,33 @@ public class MemberOperationServiceImpl implements MemberOperationService {
     @Autowired
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
 
-    public void asyncUpdateMemberVip(MemberDTO memberDTO) {
-        String code = memberDTO.getCode();
-        MemberDTO memberDTO1 = this.findByCode(code);
-        memberDTO1.setVip(memberDTO.getVip());
-        memberDTO1.setVipExpireTime(memberDTO.getVipExpireTime());
+    public void asyncUpdateMemberVipAndVipExpireTime(MemberDTO resource) {
+        log.info("修改会员vip，参数==>>{}", resource);
+
+        String code = resource.getCode();
+        if (StringUtils.isBlank(code)) {
+            log.error("修改会员vip失败，参数错误，会员code为空");
+            return;
+        }
+
+        MemberDTO memberDTO = this.findByCode(code);
+
         Member member = new Member();
-        BeanUtils.copyProperties(memberDTO1, member);
-        this.update(member);
+        member.setId(memberDTO.getId());
+        member.setVip(resource.getVip());
+        member.setVipExpireTime(resource.getVipExpireTime());
+        this.memberService.doUpdateMemberVipAndVipExpireTime(member);
+    }
+
+    public void asyncCreateMemberVipHistory(MemberVipHistoryDTO memberVipHistoryDTO) {
+        String memberCode = memberVipHistoryDTO.getMemberCode();
+        MemberDTO memberDTO = this.findByCode(memberCode);
+        memberVipHistoryDTO.setMemberId(memberDTO.getId());
+
+        MemberVipHistory memberVipHistory = new MemberVipHistory();
+        BeanUtils.copyProperties(memberVipHistoryDTO, MemberVipHistory.class);
+        memberVipHistory.setId(null);
+        this.memberVipHistoryService.create(memberVipHistory);
     }
 
     //    @Cacheable(key = "#memberId")
@@ -94,8 +117,8 @@ public class MemberOperationServiceImpl implements MemberOperationService {
 //    @CachePut(key = "#resources.id")
     @Override
     public MemberDTO doUpdateMemberPoints(Member resources) {
-//        return this.memberService.doUpdateMemberPoints(resources);
         MemberDTO memberDTO = this.findByCode(resources.getCode());
+
         Member member = new Member();
         member.setId(memberDTO.getId());
         member.setPoints(resources.getPoints());

@@ -7,12 +7,12 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
 import com.topdraw.business.module.member.service.MemberService;
 import com.topdraw.business.module.member.service.dto.MemberDTO;
 import com.topdraw.business.process.service.dto.MemberProfileAndMemberDTO;
-import com.topdraw.business.process.service.member.MemberOperationService;
 import com.topdraw.business.process.service.member.MemberProfileOperationService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.util.Objects;
 
@@ -26,83 +26,100 @@ import java.util.Objects;
  * @since : modified in 2022/3/20 17:34
  */
 @Service
+@Slf4j
 public class MemberProfileOperationServiceImpl implements MemberProfileOperationService {
 
     @Autowired
-    private MemberProfileService memberProfileService;
-    @Autowired
-    private MemberOperationService memberOperationService;
-    @Autowired
     private MemberService memberService;
+    @Autowired
+    private MemberProfileService memberProfileService;
+
+    /**
+     *
+     * @param resource
+     */
+    public void asyncCreateMemberProfileAndSyncMember(MemberProfileDTO resource) {
+        log.info("创建会员属性，参数 ==>> {}", resource);
+        String memberCode = resource.getMemberCode();
+        if (StringUtils.isBlank(memberCode)) {
+            log.error("创建会员属性失败，会员code不存在");
+            return;
+        }
 
-    public void asyncCreateMemberProfile(MemberProfileDTO memberProfileDTO) {
-        String memberCode = memberProfileDTO.getMemberCode();
         MemberDTO memberDTO = this.memberService.findByCode(memberCode);
+        if (Objects.isNull(memberDTO.getId())) {
+            log.error("创建会员属性失败，会员信息不存在 ==>> memberCode ==>> {}", memberCode);
+            return;
+        }
+
         Long memberId = memberDTO.getId();
         MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
+
         if (Objects.isNull(_memberProfileDTO.getId())) {
-            memberProfileDTO.setMemberId(memberId);
-            this.createMemberProfileAndSyncMember(memberProfileDTO, memberDTO);
-        }
 
-    }
+            MemberProfile memberProfile = new MemberProfile();
+            BeanUtils.copyProperties(resource, memberProfile);
+            memberProfile.setId(null);
+            memberProfile.setMemberId(memberId);
+            this.memberProfileService.createDefault(memberProfile);
 
-    private void createMemberProfileAndSyncMember(MemberProfileDTO memberProfileDTO, MemberDTO memberDTO) {
-        this.createMemberProfile(memberProfileDTO);
-        this.syncMember(memberProfileDTO, memberDTO);
-    }
+            Member member = new Member();
+            member.setId(memberDTO.getId());
+            member.setCode(memberDTO.getCode());
+            member.setAvatarUrl(memberProfile.getAvatarUrl());
+            member.setNickname(memberProfile.getRealname());
+            member.setGender(memberProfile.getGender());
+            this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member);
+        }
 
-    private void syncMember(MemberProfileDTO memberProfileDTO, MemberDTO memberDTO) {
-        memberDTO.setAvatarUrl(memberProfileDTO.getAvatarUrl());
-        memberDTO.setNickname(memberProfileDTO.getRealname());
-        memberDTO.setGender(memberProfileDTO.getGender());
-        Member member = new Member();
-        BeanUtils.copyProperties(memberDTO, member);
-        this.memberService.update(member);
     }
 
-    private void createMemberProfile(MemberProfileDTO memberProfileDTO) {
-        MemberProfile memberProfile = new MemberProfile();
-        BeanUtils.copyProperties(memberProfileDTO, memberProfile);
-        this.memberProfileService.createDefault(memberProfile);
-    }
-
-    public MemberProfileDTO asyncMemberProfile(MemberProfileDTO memberProfileDTO){
-        String memberCode = memberProfileDTO.getMemberCode();
-        MemberDTO memberDTO = this.memberService.findByCode(memberCode);
-        Long memberId = memberDTO.getId();
-        MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
-        memberProfileDTO.setId(_memberProfileDTO.getId());
-        memberProfileDTO.setMemberId(memberId);
-        return this.updateMemberProfile(memberProfileDTO);
-    }
-
-    private MemberProfileDTO updateMemberProfile(MemberProfileDTO memberProfileDTO) {
-        MemberProfile memberProfile = new MemberProfile();
-        BeanUtils.copyProperties(memberProfileDTO, memberProfile);
-        return this.memberProfileService.update(memberProfile);
-    }
 
+    /**
+     *
+     * @param resources
+     */
+    public void asyncUpdateMemberProfileAndSyncMember(MemberProfileAndMemberDTO resources) {
+        log.info("修改会员属性，参数 ==>> {}", resources);
 
-    public void asyncMemberProfileAndMember(MemberProfileAndMemberDTO resources) {
         MemberProfileDTO memberProfileDTO = resources.getMemberProfileDTO();
-        MemberProfileDTO _memberProfileDTO = this.asyncMemberProfile(memberProfileDTO);
+        if (Objects.isNull(memberProfileDTO)) {
+            log.error("修改会员属性异常, 会员属性参数为空");
+            return;
+        }
 
         MemberDTO memberDTO = resources.getMemberDTO();
+        if (Objects.isNull(memberDTO)) {
+            log.error("修改会员属性异常, 会员信息为空");
+            return;
+        }
+
+        MemberProfileDTO _memberProfileDTO = this.asyncMemberProfile(memberProfileDTO);
         String code = memberDTO.getCode();
         if (!StringUtils.isEmpty(code)) {
             MemberDTO memberDTO1 = this.memberService.findByCode(code);
 
             Member member = new Member();
-            BeanUtils.copyProperties(memberDTO1, member);
-
+            member.setId(memberDTO1.getId());
             member.setNickname(_memberProfileDTO.getRealname());
             member.setBirthday(_memberProfileDTO.getBirthday());
             member.setGender(_memberProfileDTO.getGender());
-            this.memberService.update(member);
+            this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member);
         }
+    }
+
+    public MemberProfileDTO asyncMemberProfile(MemberProfileDTO memberProfileDTO){
+        String memberCode = memberProfileDTO.getMemberCode();
+        MemberDTO memberDTO = this.memberService.findByCode(memberCode);
+        Long memberId = memberDTO.getId();
 
+        MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
+        memberProfileDTO.setId(_memberProfileDTO.getId());
+        memberProfileDTO.setMemberId(memberId);
 
+        MemberProfile memberProfile = new MemberProfile();
+        BeanUtils.copyProperties(memberProfileDTO, memberProfile);
+        return this.memberProfileService.update(memberProfile);
     }
 
 }