Commit c60f18f6 c60f18f6b36efa2736e42059c86f280b6b3395bf by xianghan

1.修改绑定、解绑的实现方式

1 parent 1e729a4f
...@@ -54,4 +54,11 @@ public interface MemberRepository extends JpaRepository<Member, Long>, JpaSpecif ...@@ -54,4 +54,11 @@ public interface MemberRepository extends JpaRepository<Member, Long>, JpaSpecif
54 "`vip_expire_time` = :#{#resources.vipExpireTime} , `update_time`= now() " + 54 "`vip_expire_time` = :#{#resources.vipExpireTime} , `update_time`= now() " +
55 " WHERE `id` = :#{#resources.id}", nativeQuery = true) 55 " WHERE `id` = :#{#resources.id}", nativeQuery = true)
56 Integer updateMemberVipAndVipExpireTime(@Param("resources") Member member); 56 Integer updateMemberVipAndVipExpireTime(@Param("resources") Member member);
57
58 @Modifying
59 @Query(value = "UPDATE `uc_member` SET `user_iptv_id` = :#{#resources.userIptvId}, " +
60 "`bind_iptv_platform_type` = :#{#resources.bindIptvPlatformType} , `bind_iptv_time` = :#{#resources.bindIptvTime} , " +
61 " `update_time`= now() " +
62 " WHERE `id` = :#{#resources.id}", nativeQuery = true)
63 Integer doUpdateMemberUserIptvIdAndBindPlatformTypeAndBingTime(@Param("resources") Member member);
57 } 64 }
......
...@@ -86,4 +86,6 @@ public interface MemberService { ...@@ -86,4 +86,6 @@ public interface MemberService {
86 void updateUserIptvIdById(Long id, Long userIptvId, LocalDateTime now); 86 void updateUserIptvIdById(Long id, Long userIptvId, LocalDateTime now);
87 87
88 void doUpdateMemberCoupon(Member member); 88 void doUpdateMemberCoupon(Member member);
89
90 Integer doUpdateMemberUserIptvIdAndBindPlatformTypeAndBingTime(Member member);
89 } 91 }
......
...@@ -175,6 +175,12 @@ public class MemberServiceImpl implements MemberService { ...@@ -175,6 +175,12 @@ public class MemberServiceImpl implements MemberService {
175 175
176 @Override 176 @Override
177 @Transactional(rollbackFor = Exception.class) 177 @Transactional(rollbackFor = Exception.class)
178 public Integer doUpdateMemberUserIptvIdAndBindPlatformTypeAndBingTime(Member member) {
179 return this.memberRepository.doUpdateMemberUserIptvIdAndBindPlatformTypeAndBingTime(member);
180 }
181
182 @Override
183 @Transactional(rollbackFor = Exception.class)
178 public MemberDTO update(Member resources) { 184 public MemberDTO update(Member resources) {
179 185
180 log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources); 186 log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources);
......
...@@ -184,13 +184,6 @@ public class UserTvServiceImpl implements UserTvService { ...@@ -184,13 +184,6 @@ public class UserTvServiceImpl implements UserTvService {
184 @Override 184 @Override
185 @Transactional(rollbackFor = Exception.class) 185 @Transactional(rollbackFor = Exception.class)
186 public void unbindPriorityMemberCode(UserTv resources) { 186 public void unbindPriorityMemberCode(UserTv resources) {
187 String platformAccount = resources.getPlatformAccount();
188 if (StringUtils.isNotBlank(platformAccount)) {
189 UserTvDTO userTvDTO = this.findByPlatformAccount(platformAccount);
190 Long id = userTvDTO.getId();
191 resources.setId(id);
192 resources.setMemberId(userTvDTO.getMemberId());
193 }
194 this.userTvRepository.save(resources); 187 this.userTvRepository.save(resources);
195 } 188 }
196 189
......
...@@ -266,30 +266,26 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -266,30 +266,26 @@ public class UserOperationServiceImpl implements UserOperationService {
266 266
267 String platformAccount = userTvDTO.getPlatformAccount(); 267 String platformAccount = userTvDTO.getPlatformAccount();
268 UserTvDTO _userTvDTO = this.userTvService.findByPlatformAccount(platformAccount); 268 UserTvDTO _userTvDTO = this.userTvService.findByPlatformAccount(platformAccount);
269 _userTvDTO.setPriorityMemberCode(userTvDTO.getPriorityMemberCode()); 269 if (Objects.nonNull(_userTvDTO.getId())) {
270 // 270 //
271 this.unbindPriorityMemberCode(_userTvDTO); 271 UserTv userTv = new UserTv();
272 272 userTv.setPriorityMemberCode(userTvDTO.getPriorityMemberCode());
273 userTv.setId(_userTvDTO.getId());
274 userTv.setPlatformAccount(_userTvDTO.getPlatformAccount());
275 this.userTvService.doUpdatePriorityMemberCode(userTv);
276 }
273 277
274 String code = memberDTO.getCode(); 278 String code = memberDTO.getCode();
275 MemberDTO _memberDTO = this.memberService.findByCode(code); 279 MemberDTO _memberDTO = this.memberService.findByCode(code);
276 this.unbindUserIpTv(_memberDTO); 280 if (Objects.nonNull(_memberDTO.getId())) {
277
278 }
279
280 private void unbindUserIpTv(MemberDTO memberDTO) {
281 memberDTO.setUserIptvId(null);
282 memberDTO.setBindIptvPlatformType(null);
283 memberDTO.setBindIptvTime(null);
284 Member member = new Member(); 281 Member member = new Member();
285 BeanUtils.copyProperties(memberDTO, member); 282 member.setId(_memberDTO.getId());
286 this.memberService.unbindUserIpTv(member); 283 member.setUserIptvId(null);
284 member.setBindIptvPlatformType(null);
285 member.setBindIptvTime(null);
286 this.memberService.doUpdateMemberUserIptvIdAndBindPlatformTypeAndBingTime(member);
287 } 287 }
288 288
289 private void unbindPriorityMemberCode(UserTvDTO userTvDTO) {
290 UserTv userTv = new UserTv();
291 BeanUtils.copyProperties(userTvDTO, userTv);
292 this.userTvService.unbindPriorityMemberCode(userTv);
293 } 289 }
294 290
295 @Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class) 291 @Transactional(propagation = Propagation.SUPPORTS, rollbackFor = Exception.class)
......