Skip to content

张云鹏 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a1b52b0e a1b52b0e902fdb634e1c8a6e0e1a0d9820bdf2cc by xianghan
Options

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

1 parent ca54709d
Inline Side-by-side
Showing 7 changed files with 154 additions and 96 deletions
...@@ -43,4 +43,15 @@ public interface MemberRepository extends JpaRepository<Member, Long>, JpaSpecif ...@@ -43,4 +43,15 @@ public interface MemberRepository extends JpaRepository<Member, Long>, JpaSpecif
43 " WHERE `id` = :#{#resources.id}", nativeQuery = true) 43 " WHERE `id` = :#{#resources.id}", nativeQuery = true)
44 void doUpdateMemberCoupon(@Param("resources") Member member); 44 void doUpdateMemberCoupon(@Param("resources") Member member);
45 45
46 @Modifying
47 @Query(value = "UPDATE `uc_member` SET `avatar_url` = :#{#resources.avatarUrl}, `update_time` = now() , " +
48 " `nickname`= :#{#resources.nickname}, " +
49 " `gender`=:#{#resources.gender} WHERE `id` = :#{#resources.id}", nativeQuery = true)
50 Integer updateMemberAvatarUrlAndNicknameAndGender(@Param("resources") Member resources);
51
52 @Modifying
53 @Query(value = "UPDATE `uc_member` SET `vip` = :#{#resources.vip}, " +
54 "`vip_expire_time` = :#{#resources.vipExpireTime} , `update_time`= now() " +
55 " WHERE `id` = :#{#resources.id}", nativeQuery = true)
56 Integer updateMemberVipAndVipExpireTime(@Param("resources") Member member);
46 } 57 }
......
...@@ -12,7 +12,12 @@ import java.util.List; ...@@ -12,7 +12,12 @@ import java.util.List;
12 */ 12 */
13 public interface MemberService { 13 public interface MemberService {
14 14
15 15 /**
16 *
17 * @param member
18 * @return
19 */
20 MemberDTO doUpdateMemberVipAndVipExpireTime(Member member);
16 21
17 /** 22 /**
18 * 根据ID查询 23 * 根据ID查询
...@@ -36,30 +41,23 @@ public interface MemberService { ...@@ -36,30 +41,23 @@ public interface MemberService {
36 MemberDTO create(Member resources); 41 MemberDTO create(Member resources);
37 42
38 /** 43 /**
39 * 创建并返回会员
40 * @param resources 会员
41 * @return Member
42 */
43 MemberDTO createAndReturnMember(Member resources);
44
45 /**
46 * 修改会员 44 * 修改会员
47 * @param resources 45 * @param resources
48 */ 46 */
49 MemberDTO update(Member resources); 47 MemberDTO update(Member resources);
50 48
51 /** 49 /**
52 * 修改会员积分 50 *
53 * @param member 会员 51 * @param resources
52 * @return
54 */ 53 */
55 MemberDTO doUpdateMemberPoints(Member member); 54 MemberDTO doUpdateMemberAvatarUrlAndNicknameAndGender(Member resources);
56 55
57 /** 56 /**
58 * 查询绑定了大屏会员列表 57 * 修改会员积分
59 * @param id 条件参数 58 * @param resources 会员
60 * @return Map<String,Object>
61 */ 59 */
62 List<MemberDTO> findByUserIptvId(Long id); 60 MemberDTO doUpdateMemberPoints(Member resources);
63 61
64 /** 62 /**
65 * 检查会员信息 63 * 检查会员信息
......
...@@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Propagation; ...@@ -23,7 +23,6 @@ import org.springframework.transaction.annotation.Propagation;
23 import org.springframework.transaction.annotation.Transactional; 23 import org.springframework.transaction.annotation.Transactional;
24 24
25 import java.time.LocalDateTime; 25 import java.time.LocalDateTime;
26 import java.util.List;
27 import java.util.Objects; 26 import java.util.Objects;
28 27
29 /** 28 /**
...@@ -46,6 +45,20 @@ public class MemberServiceImpl implements MemberService { ...@@ -46,6 +45,20 @@ public class MemberServiceImpl implements MemberService {
46 45
47 46
48 @Override 47 @Override
48 @Transactional(rollbackFor = Exception.class)
49 public MemberDTO doUpdateMemberVipAndVipExpireTime(Member resource) {
50 log.info("修改会员vip和vip过期时间 ==>> {}", resource);
51
52 Integer count = this.memberRepository.updateMemberVipAndVipExpireTime(resource);
53 if (Objects.nonNull(count) && count > 0) {
54 Member member = this.memberRepository.findById(resource.getId()).orElseGet(Member::new);
55 return this.memberMapper.toDto(member);
56 }
57
58 return this.memberMapper.toDto(resource);
59 }
60
61 @Override
49 public MemberDTO findById(Long id) { 62 public MemberDTO findById(Long id) {
50 Member member = this.memberRepository.findById(id).orElseGet(Member::new); 63 Member member = this.memberRepository.findById(id).orElseGet(Member::new);
51 ValidationUtil.isNull(member.getId(),"Member","id",id); 64 ValidationUtil.isNull(member.getId(),"Member","id",id);
...@@ -56,31 +69,18 @@ public class MemberServiceImpl implements MemberService { ...@@ -56,31 +69,18 @@ public class MemberServiceImpl implements MemberService {
56 69
57 @Override 70 @Override
58 public MemberDTO findByCode(String code) { 71 public MemberDTO findByCode(String code) {
59
60 Member member = this.memberRepository.findFirstByCode(code).orElseGet(Member::new); 72 Member member = this.memberRepository.findFirstByCode(code).orElseGet(Member::new);
61
62 return this.memberMapper.toDto(member); 73 return this.memberMapper.toDto(member);
63 } 74 }
64 75
65 private MemberDTO findByIdOrCode(Long id, String code) { 76 private MemberDTO findByIdOrCode(Long id, String code) {
66
67 Member member = this.memberRepository.findByIdOrCode(id,code).orElseGet(Member::new); 77 Member member = this.memberRepository.findByIdOrCode(id,code).orElseGet(Member::new);
68 ValidationUtil.isNull(member.getId(),"Member","param",code); 78 ValidationUtil.isNull(member.getId(),"Member","param",code);
69
70 return this.memberMapper.toDto(member); 79 return this.memberMapper.toDto(member);
71 80
72 } 81 }
73 82
74 @Override 83 @Override
75 public List<MemberDTO> findByUserIptvId(Long id) {
76
77 List<Member> memberList = this.memberRepository.findByUserIptvId(id);
78
79 return this.memberMapper.toDto(memberList);
80
81 }
82
83 @Override
84 public MemberDTO checkMember(Long id, String memberCode) { 84 public MemberDTO checkMember(Long id, String memberCode) {
85 85
86 if(Objects.isNull(id) && StringUtils.isBlank(memberCode)) 86 if(Objects.isNull(id) && StringUtils.isBlank(memberCode))
...@@ -151,16 +151,6 @@ public class MemberServiceImpl implements MemberService { ...@@ -151,16 +151,6 @@ public class MemberServiceImpl implements MemberService {
151 151
152 @Override 152 @Override
153 @Transactional(rollbackFor = Exception.class) 153 @Transactional(rollbackFor = Exception.class)
154 public MemberDTO createAndReturnMember(Member resources) {
155
156 MemberDTO memberDTO = this.create(MemberBuilder.build(resources));
157
158 return memberDTO;
159
160 }
161
162 @Override
163 @Transactional(rollbackFor = Exception.class)
164 public void unbind(Member resources) { 154 public void unbind(Member resources) {
165 try { 155 try {
166 String code = resources.getCode(); 156 String code = resources.getCode();
...@@ -224,6 +214,17 @@ public class MemberServiceImpl implements MemberService { ...@@ -224,6 +214,17 @@ public class MemberServiceImpl implements MemberService {
224 214
225 } 215 }
226 216
217 @Override
218 @Transactional(rollbackFor = Exception.class)
219 public MemberDTO doUpdateMemberAvatarUrlAndNicknameAndGender(Member resources) {
220 Integer count = this.memberRepository.updateMemberAvatarUrlAndNicknameAndGender(resources);
221 if (Objects.nonNull(count) && count > 0) {
222 Member member = this.memberRepository.findById(resources.getId()).orElseGet(Member::new);
223 return this.memberMapper.toDto(member);
224 }
225 return this.memberMapper.toDto(resources);
226 }
227
227 public Member save(Member member){ 228 public Member save(Member member){
228 return this.memberRepository.save(member); 229 return this.memberRepository.save(member);
229 } 230 }
......
...@@ -17,6 +17,9 @@ public class MemberVipHistoryDTO implements Serializable { ...@@ -17,6 +17,9 @@ public class MemberVipHistoryDTO implements Serializable {
17 // 主键 17 // 主键
18 private Long id; 18 private Long id;
19 19
20 //
21 private String memberCode;
22
20 // 会员id 23 // 会员id
21 private Long memberId; 24 private Long memberId;
22 25
......
...@@ -49,7 +49,12 @@ public class PointsOperationServiceImpl implements PointsOperationService { ...@@ -49,7 +49,12 @@ public class PointsOperationServiceImpl implements PointsOperationService {
49 ThreadPoolTaskExecutor threadPoolTaskExecutor; 49 ThreadPoolTaskExecutor threadPoolTaskExecutor;
50 50
51 public void asyncMemberPoint(Member member) { 51 public void asyncMemberPoint(Member member) {
52 log.info("修改会员积分,参数 =>> {}", member);
52 String code = member.getCode(); 53 String code = member.getCode();
54 if (StringUtils.isBlank(code)) {
55 log.error("修改会员积分失败，参数错误，会员code为空");
56 return;
57 }
53 MemberDTO memberDTO = this.memberService.findByCode(code); 58 MemberDTO memberDTO = this.memberService.findByCode(code);
54 member.setId(memberDTO.getId()); 59 member.setId(memberDTO.getId());
55 this.memberService.doUpdateMemberPoints(member); 60 this.memberService.doUpdateMemberPoints(member);
......
...@@ -8,9 +8,12 @@ import com.topdraw.business.module.member.service.MemberService; ...@@ -8,9 +8,12 @@ import com.topdraw.business.module.member.service.MemberService;
8 import com.topdraw.business.module.member.service.dto.MemberDTO; 8 import com.topdraw.business.module.member.service.dto.MemberDTO;
9 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory; 9 import com.topdraw.business.module.member.viphistory.domain.MemberVipHistory;
10 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService; 10 import com.topdraw.business.module.member.viphistory.service.MemberVipHistoryService;
11 import com.topdraw.business.module.member.viphistory.service.dto.MemberVipHistoryDTO;
11 import com.topdraw.business.module.user.weixin.service.UserWeixinService; 12 import com.topdraw.business.module.user.weixin.service.UserWeixinService;
12 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO; 13 import com.topdraw.business.module.user.weixin.service.dto.UserWeixinDTO;
13 import com.topdraw.business.process.service.member.MemberOperationService; 14 import com.topdraw.business.process.service.member.MemberOperationService;
15 import lombok.extern.slf4j.Slf4j;
16 import org.apache.commons.lang3.StringUtils;
14 import org.springframework.beans.BeanUtils; 17 import org.springframework.beans.BeanUtils;
15 import org.springframework.beans.factory.annotation.Autowired; 18 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; 19 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
...@@ -23,6 +26,7 @@ import java.util.Objects; ...@@ -23,6 +26,7 @@ import java.util.Objects;
23 26
24 @Service 27 @Service
25 //@CacheConfig(cacheNames = "member") 28 //@CacheConfig(cacheNames = "member")
29 @Slf4j
26 public class MemberOperationServiceImpl implements MemberOperationService { 30 public class MemberOperationServiceImpl implements MemberOperationService {
27 31
28 @Autowired 32 @Autowired
...@@ -36,14 +40,33 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -36,14 +40,33 @@ public class MemberOperationServiceImpl implements MemberOperationService {
36 @Autowired 40 @Autowired
37 private ThreadPoolTaskExecutor threadPoolTaskExecutor; 41 private ThreadPoolTaskExecutor threadPoolTaskExecutor;
38 42
39 public void asyncUpdateMemberVip(MemberDTO memberDTO) { 43 public void asyncUpdateMemberVipAndVipExpireTime(MemberDTO resource) {
40 String code = memberDTO.getCode(); 44 log.info("修改会员vip，参数==>>{}", resource);
41 MemberDTO memberDTO1 = this.findByCode(code); 45
42 memberDTO1.setVip(memberDTO.getVip()); 46 String code = resource.getCode();
43 memberDTO1.setVipExpireTime(memberDTO.getVipExpireTime()); 47 if (StringUtils.isBlank(code)) {
48 log.error("修改会员vip失败，参数错误，会员code为空");
49 return;
50 }
51
52 MemberDTO memberDTO = this.findByCode(code);
53
44 Member member = new Member(); 54 Member member = new Member();
45 BeanUtils.copyProperties(memberDTO1, member); 55 member.setId(memberDTO.getId());
46 this.update(member); 56 member.setVip(resource.getVip());
57 member.setVipExpireTime(resource.getVipExpireTime());
58 this.memberService.doUpdateMemberVipAndVipExpireTime(member);
59 }
60
61 public void asyncCreateMemberVipHistory(MemberVipHistoryDTO memberVipHistoryDTO) {
62 String memberCode = memberVipHistoryDTO.getMemberCode();
63 MemberDTO memberDTO = this.findByCode(memberCode);
64 memberVipHistoryDTO.setMemberId(memberDTO.getId());
65
66 MemberVipHistory memberVipHistory = new MemberVipHistory();
67 BeanUtils.copyProperties(memberVipHistoryDTO, MemberVipHistory.class);
68 memberVipHistory.setId(null);
69 this.memberVipHistoryService.create(memberVipHistory);
47 } 70 }
48 71
49 // @Cacheable(key = "#memberId") 72 // @Cacheable(key = "#memberId")
...@@ -94,8 +117,8 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -94,8 +117,8 @@ public class MemberOperationServiceImpl implements MemberOperationService {
94 // @CachePut(key = "#resources.id") 117 // @CachePut(key = "#resources.id")
95 @Override 118 @Override
96 public MemberDTO doUpdateMemberPoints(Member resources) { 119 public MemberDTO doUpdateMemberPoints(Member resources) {
97 // return this.memberService.doUpdateMemberPoints(resources);
98 MemberDTO memberDTO = this.findByCode(resources.getCode()); 120 MemberDTO memberDTO = this.findByCode(resources.getCode());
121
99 Member member = new Member(); 122 Member member = new Member();
100 member.setId(memberDTO.getId()); 123 member.setId(memberDTO.getId());
101 member.setPoints(resources.getPoints()); 124 member.setPoints(resources.getPoints());
......
...@@ -7,12 +7,12 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO; ...@@ -7,12 +7,12 @@ import com.topdraw.business.module.member.profile.service.dto.MemberProfileDTO;
7 import com.topdraw.business.module.member.service.MemberService; 7 import com.topdraw.business.module.member.service.MemberService;
8 import com.topdraw.business.module.member.service.dto.MemberDTO; 8 import com.topdraw.business.module.member.service.dto.MemberDTO;
9 import com.topdraw.business.process.service.dto.MemberProfileAndMemberDTO; 9 import com.topdraw.business.process.service.dto.MemberProfileAndMemberDTO;
10 import com.topdraw.business.process.service.member.MemberOperationService;
11 import com.topdraw.business.process.service.member.MemberProfileOperationService; 10 import com.topdraw.business.process.service.member.MemberProfileOperationService;
11 import lombok.extern.slf4j.Slf4j;
12 import org.apache.commons.lang3.StringUtils;
12 import org.springframework.beans.BeanUtils; 13 import org.springframework.beans.BeanUtils;
13 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.stereotype.Service; 15 import org.springframework.stereotype.Service;
15 import org.springframework.util.StringUtils;
16 16
17 import java.util.Objects; 17 import java.util.Objects;
18 18
...@@ -26,83 +26,100 @@ import java.util.Objects; ...@@ -26,83 +26,100 @@ import java.util.Objects;
26 * @since : modified in 2022/3/20 17:34 26 * @since : modified in 2022/3/20 17:34
27 */ 27 */
28 @Service 28 @Service
29 @Slf4j
29 public class MemberProfileOperationServiceImpl implements MemberProfileOperationService { 30 public class MemberProfileOperationServiceImpl implements MemberProfileOperationService {
30 31
31 @Autowired 32 @Autowired
32 private MemberProfileService memberProfileService;
33 @Autowired
34 private MemberOperationService memberOperationService;
35 @Autowired
36 private MemberService memberService; 33 private MemberService memberService;
34 @Autowired
35 private MemberProfileService memberProfileService;
36
37 /**
38 *
39 * @param resource
40 */
41 public void asyncCreateMemberProfileAndSyncMember(MemberProfileDTO resource) {
42 log.info("创建会员属性，参数 ==>> {}", resource);
43 String memberCode = resource.getMemberCode();
44 if (StringUtils.isBlank(memberCode)) {
45 log.error("创建会员属性失败，会员code不存在");
46 return;
47 }
37 48
38 public void asyncCreateMemberProfile(MemberProfileDTO memberProfileDTO) {
39 String memberCode = memberProfileDTO.getMemberCode();
40 MemberDTO memberDTO = this.memberService.findByCode(memberCode); 49 MemberDTO memberDTO = this.memberService.findByCode(memberCode);
50 if (Objects.isNull(memberDTO.getId())) {
51 log.error("创建会员属性失败，会员信息不存在 ==>> memberCode ==>> {}", memberCode);
52 return;
53 }
54
41 Long memberId = memberDTO.getId(); 55 Long memberId = memberDTO.getId();
42 MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId); 56 MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
57
43 if (Objects.isNull(_memberProfileDTO.getId())) { 58 if (Objects.isNull(_memberProfileDTO.getId())) {
44 memberProfileDTO.setMemberId(memberId);
45 this.createMemberProfileAndSyncMember(memberProfileDTO, memberDTO);
46 }
47 59
48 } 60 MemberProfile memberProfile = new MemberProfile();
61 BeanUtils.copyProperties(resource, memberProfile);
62 memberProfile.setId(null);
63 memberProfile.setMemberId(memberId);
64 this.memberProfileService.createDefault(memberProfile);
49 65
50 private void createMemberProfileAndSyncMember(MemberProfileDTO memberProfileDTO, MemberDTO memberDTO) { 66 Member member = new Member();
51 this.createMemberProfile(memberProfileDTO); 67 member.setId(memberDTO.getId());
52 this.syncMember(memberProfileDTO, memberDTO); 68 member.setCode(memberDTO.getCode());
53 } 69 member.setAvatarUrl(memberProfile.getAvatarUrl());
70 member.setNickname(memberProfile.getRealname());
71 member.setGender(memberProfile.getGender());
72 this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member);
73 }
54 74
55 private void syncMember(MemberProfileDTO memberProfileDTO, MemberDTO memberDTO) {
56 memberDTO.setAvatarUrl(memberProfileDTO.getAvatarUrl());
57 memberDTO.setNickname(memberProfileDTO.getRealname());
58 memberDTO.setGender(memberProfileDTO.getGender());
59 Member member = new Member();
60 BeanUtils.copyProperties(memberDTO, member);
61 this.memberService.update(member);
62 } 75 }
63 76
64 private void createMemberProfile(MemberProfileDTO memberProfileDTO) {
65 MemberProfile memberProfile = new MemberProfile();
66 BeanUtils.copyProperties(memberProfileDTO, memberProfile);
67 this.memberProfileService.createDefault(memberProfile);
68 }
69
70 public MemberProfileDTO asyncMemberProfile(MemberProfileDTO memberProfileDTO){
71 String memberCode = memberProfileDTO.getMemberCode();
72 MemberDTO memberDTO = this.memberService.findByCode(memberCode);
73 Long memberId = memberDTO.getId();
74 MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
75 memberProfileDTO.setId(_memberProfileDTO.getId());
76 memberProfileDTO.setMemberId(memberId);
77 return this.updateMemberProfile(memberProfileDTO);
78 }
79
80 private MemberProfileDTO updateMemberProfile(MemberProfileDTO memberProfileDTO) {
81 MemberProfile memberProfile = new MemberProfile();
82 BeanUtils.copyProperties(memberProfileDTO, memberProfile);
83 return this.memberProfileService.update(memberProfile);
84 }
85 77
78 /**
79 *
80 * @param resources
81 */
82 public void asyncUpdateMemberProfileAndSyncMember(MemberProfileAndMemberDTO resources) {
83 log.info("修改会员属性，参数 ==>> {}", resources);
86 84
87 public void asyncMemberProfileAndMember(MemberProfileAndMemberDTO resources) {
88 MemberProfileDTO memberProfileDTO = resources.getMemberProfileDTO(); 85 MemberProfileDTO memberProfileDTO = resources.getMemberProfileDTO();
89 MemberProfileDTO _memberProfileDTO = this.asyncMemberProfile(memberProfileDTO); 86 if (Objects.isNull(memberProfileDTO)) {
87 log.error("修改会员属性异常, 会员属性参数为空");
88 return;
89 }
90 90
91 MemberDTO memberDTO = resources.getMemberDTO(); 91 MemberDTO memberDTO = resources.getMemberDTO();
92 if (Objects.isNull(memberDTO)) {
93 log.error("修改会员属性异常, 会员信息为空");
94 return;
95 }
96
97 MemberProfileDTO _memberProfileDTO = this.asyncMemberProfile(memberProfileDTO);
92 String code = memberDTO.getCode(); 98 String code = memberDTO.getCode();
93 if (!StringUtils.isEmpty(code)) { 99 if (!StringUtils.isEmpty(code)) {
94 MemberDTO memberDTO1 = this.memberService.findByCode(code); 100 MemberDTO memberDTO1 = this.memberService.findByCode(code);
95 101
96 Member member = new Member(); 102 Member member = new Member();
97 BeanUtils.copyProperties(memberDTO1, member); 103 member.setId(memberDTO1.getId());
98
99 member.setNickname(_memberProfileDTO.getRealname()); 104 member.setNickname(_memberProfileDTO.getRealname());
100 member.setBirthday(_memberProfileDTO.getBirthday()); 105 member.setBirthday(_memberProfileDTO.getBirthday());
101 member.setGender(_memberProfileDTO.getGender()); 106 member.setGender(_memberProfileDTO.getGender());
102 this.memberService.update(member); 107 this.memberService.doUpdateMemberAvatarUrlAndNicknameAndGender(member);
103 } 108 }
109 }
110
111 public MemberProfileDTO asyncMemberProfile(MemberProfileDTO memberProfileDTO){
112 String memberCode = memberProfileDTO.getMemberCode();
113 MemberDTO memberDTO = this.memberService.findByCode(memberCode);
114 Long memberId = memberDTO.getId();
104 115
116 MemberProfileDTO _memberProfileDTO = this.memberProfileService.findByMemberId(memberId);
117 memberProfileDTO.setId(_memberProfileDTO.getId());
118 memberProfileDTO.setMemberId(memberId);
105 119
120 MemberProfile memberProfile = new MemberProfile();
121 BeanUtils.copyProperties(memberProfileDTO, memberProfile);
122 return this.memberProfileService.update(memberProfile);
106 } 123 }
107 124
108 } 125 }
......