Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit e6a0d117 e6a0d117ced9295ad3a3dcc5c878cea47244a9ea by xianghan
Options

1.优化

1 parent 48409765
Inline Side-by-side
Showing 17 changed files with 141 additions and 96 deletions
...@@ -20,7 +20,7 @@ import io.swagger.annotations.*; ...@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
20 */ 20 */
21 @Api(tags = "会员地址管理") 21 @Api(tags = "会员地址管理")
22 @RestController 22 @RestController
23 @RequestMapping("/ucEngine/memberAddress") 23 @RequestMapping("/ucEngine/api/memberAddress")
24 @CrossOrigin 24 @CrossOrigin
25 @Slf4j 25 @Slf4j
26 public class MemberAddressController { 26 public class MemberAddressController {
......
1 package com.topdraw.business.module.member.domain; 1 package com.topdraw.business.module.member.domain;
2 2
3 3
4 import com.topdraw.business.module.member.service.dto.MemberDTO;
4 import com.topdraw.util.IdWorker; 5 import com.topdraw.util.IdWorker;
5 import org.apache.commons.lang3.StringUtils; 6 import org.apache.commons.lang3.StringUtils;
6 7
......
...@@ -20,7 +20,7 @@ import io.swagger.annotations.*; ...@@ -20,7 +20,7 @@ import io.swagger.annotations.*;
20 */ 20 */
21 @Api(tags = "会员属性管理") 21 @Api(tags = "会员属性管理")
22 @RestController 22 @RestController
23 @RequestMapping("/ucEngine/memberProfile") 23 @RequestMapping("/ucEngine/api/memberProfile")
24 @CrossOrigin 24 @CrossOrigin
25 @Slf4j 25 @Slf4j
26 public class MemberProfileController { 26 public class MemberProfileController {
......
...@@ -2,6 +2,7 @@ package com.topdraw.business.module.member.profile.service.impl; ...@@ -2,6 +2,7 @@ package com.topdraw.business.module.member.profile.service.impl;
2 2
3 import com.topdraw.aspect.AsyncMqSend; 3 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.business.module.member.domain.Member; 4 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.domain.MemberBuilder;
5 import com.topdraw.business.module.member.profile.domain.MemberProfile; 6 import com.topdraw.business.module.member.profile.domain.MemberProfile;
6 import com.topdraw.business.module.member.profile.domain.MemberProfileBuilder; 7 import com.topdraw.business.module.member.profile.domain.MemberProfileBuilder;
7 import com.topdraw.business.module.member.service.MemberService; 8 import com.topdraw.business.module.member.service.MemberService;
......
...@@ -19,7 +19,7 @@ import io.swagger.annotations.*; ...@@ -19,7 +19,7 @@ import io.swagger.annotations.*;
19 */ 19 */
20 @Api(tags = "相关人员管理") 20 @Api(tags = "相关人员管理")
21 @RestController 21 @RestController
22 @RequestMapping("/ucEngine/memberRelatedInfo") 22 @RequestMapping("/ucEngine/api/memberRelatedInfo")
23 @CrossOrigin 23 @CrossOrigin
24 @Slf4j 24 @Slf4j
25 public class MemberRelatedInfoController { 25 public class MemberRelatedInfoController {
......
...@@ -26,8 +26,7 @@ import java.util.Objects; ...@@ -26,8 +26,7 @@ import java.util.Objects;
26 */ 26 */
27 @Api(tags = "会员管理") 27 @Api(tags = "会员管理")
28 @RestController 28 @RestController
29 //@RequestMapping("/ucEngine/api/member") 29 @RequestMapping("/ucEngine/api/member")
30 @RequestMapping("/ucEngine/member")
31 @CrossOrigin 30 @CrossOrigin
32 @Slf4j 31 @Slf4j
33 public class MemberController { 32 public class MemberController {
......
...@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*;
16 */ 16 */
17 @Api(tags = "会员vip历史管理") 17 @Api(tags = "会员vip历史管理")
18 @RestController 18 @RestController
19 @RequestMapping("/ucEngine/memberVipHistory") 19 @RequestMapping("/ucEngine/api/memberVipHistory")
20 public class MemberVipHistoryController { 20 public class MemberVipHistoryController {
21 21
22 @Autowired 22 @Autowired
......
1 package com.topdraw.business.module.member.viphistory.service.impl; 1 package com.topdraw.business.module.member.viphistory.service.impl;
2 2
3 3
4 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.business.module.member.domain.Member; 5 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.service.MemberService; 6 import com.topdraw.business.module.member.service.MemberService;
6 import com.topdraw.business.module.member.service.dto.MemberDTO; 7 import com.topdraw.business.module.member.service.dto.MemberDTO;
...@@ -49,6 +50,7 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService { ...@@ -49,6 +50,7 @@ public class MemberVipHistoryServiceImpl implements MemberVipHistoryService {
49 50
50 @Override 51 @Override
51 @Transactional(rollbackFor = Exception.class) 52 @Transactional(rollbackFor = Exception.class)
53 @AsyncMqSend
52 public void create(MemberVipHistory resources) { 54 public void create(MemberVipHistory resources) {
53 log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources); 55 log.info("MemberVipHistoryServiceImpl ==>> MemberVipHistoryServiceImpl ==>> param ==>> [{}]",resources);
54 this.checkMember(resources); 56 this.checkMember(resources);
......
...@@ -34,7 +34,7 @@ public interface UserTvService { ...@@ -34,7 +34,7 @@ public interface UserTvService {
34 * 34 *
35 * @param resources 35 * @param resources
36 */ 36 */
37 void unbindPriorityMemberCode(UserTv resources); 37 UserTvDTO unbindPriorityMemberCode(UserTv resources);
38 38
39 /** 39 /**
40 * 40 *
......
...@@ -104,20 +104,21 @@ public class UserTvServiceImpl implements UserTvService { ...@@ -104,20 +104,21 @@ public class UserTvServiceImpl implements UserTvService {
104 104
105 @Override 105 @Override
106 @Transactional(rollbackFor = Exception.class) 106 @Transactional(rollbackFor = Exception.class)
107 public void unbindPriorityMemberCode(UserTv resources) { 107 public UserTvDTO unbindPriorityMemberCode(UserTv resources) {
108 UserTv UserTv = this.userTvRepository.findById(resources.getId()).orElseGet(UserTv::new); 108 UserTv userTv = this.userTvRepository.findById(resources.getId()).orElseGet(UserTv::new);
109 ValidationUtil.isNull( UserTv.getId(),"UserTv","id",resources.getId()); 109 ValidationUtil.isNull( userTv.getId(),"UserTv","id",resources.getId());
110 UserTv.copy(resources); 110 userTv.copy(resources);
111 this.userTvRepository.save(UserTv); 111 UserTv _userTv = this.userTvRepository.save(userTv);
112 return this.userTvMapper.toDto(_userTv);
112 } 113 }
113 114
114 @Override 115 @Override
115 @Transactional(rollbackFor = Exception.class) 116 @Transactional(rollbackFor = Exception.class)
116 public void delete(Long id) { 117 public void delete(Long id) {
117 Assert.notNull(id, "The given id must not be null!"); 118 Assert.notNull(id, "The given id must not be null!");
118 UserTv UserTv = this.userTvRepository.findById(id).orElseThrow( 119 UserTv userTv = this.userTvRepository.findById(id).orElseThrow(
119 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", UserTv.class, id), 1)); 120 () -> new EmptyResultDataAccessException(String.format("No %s entity " + "with id %s " + "exists!", UserTv.class, id), 1));
120 this.userTvRepository.delete(UserTv); 121 this.userTvRepository.delete(userTv);
121 } 122 }
122 123
123 @Override 124 @Override
......
...@@ -21,13 +21,13 @@ public interface UserWeixinService { ...@@ -21,13 +21,13 @@ public interface UserWeixinService {
21 * @param resources 21 * @param resources
22 * @return 22 * @return
23 */ 23 */
24 UserWeixin create(UserWeixin resources); 24 UserWeixinDTO create(UserWeixin resources);
25 25
26 /** 26 /**
27 * 27 *
28 * @param resources 28 * @param resources
29 */ 29 */
30 void update(UserWeixin resources); 30 UserWeixinDTO update(UserWeixin resources);
31 31
32 /** 32 /**
33 * 33 *
......
...@@ -37,19 +37,20 @@ public class UserWeixinServiceImpl implements UserWeixinService { ...@@ -37,19 +37,20 @@ public class UserWeixinServiceImpl implements UserWeixinService {
37 37
38 @Override 38 @Override
39 @Transactional(rollbackFor = Exception.class) 39 @Transactional(rollbackFor = Exception.class)
40 public UserWeixin create(UserWeixin resources) { 40 public UserWeixinDTO create(UserWeixin resources) {
41 UserWeixin build = UserWeixinBuilder.build(resources); 41 UserWeixin build = UserWeixinBuilder.build(resources);
42 this.userWeixinRepository.save(build); 42 UserWeixin userWeixin = this.userWeixinRepository.save(build);
43 return resources; 43 return this.userWeixinMapper.toDto(userWeixin);
44 } 44 }
45 45
46 @Override 46 @Override
47 @Transactional(rollbackFor = Exception.class) 47 @Transactional(rollbackFor = Exception.class)
48 public void update(UserWeixin resources) { 48 public UserWeixinDTO update(UserWeixin resources) {
49 UserWeixin UserWeixin = this.userWeixinRepository.findById(resources.getId()).orElseGet(UserWeixin::new); 49 UserWeixin userWeixin = this.userWeixinRepository.findById(resources.getId()).orElseGet(UserWeixin::new);
50 ValidationUtil.isNull( UserWeixin.getId(),"UserWeixin","id",resources.getId()); 50 ValidationUtil.isNull( userWeixin.getId(),"UserWeixin","id",resources.getId());
51 UserWeixin.copy(resources); 51 userWeixin.copy(resources);
52 this.userWeixinRepository.save(UserWeixin); 52 UserWeixin _userWeixin = this.userWeixinRepository.save(userWeixin);
53 return this.userWeixinMapper.toDto(_userWeixin);
53 } 54 }
54 55
55 @Override 56 @Override
......
...@@ -264,7 +264,6 @@ public class UserOperationController { ...@@ -264,7 +264,6 @@ public class UserOperationController {
264 String nicknameEncode = Base64Util.encode(nicknameDecode); 264 String nicknameEncode = Base64Util.encode(nicknameDecode);
265 memberDTO.setNickname(nicknameEncode); 265 memberDTO.setNickname(nicknameEncode);
266 } 266 }
267
268 if (StringUtils.isNotBlank(headimgurl)) { 267 if (StringUtils.isNotBlank(headimgurl)) {
269 String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8"); 268 String headimgurlDecode = URLDecoder.decode(headimgurl, "UTF-8");
270 String imageEncode = Base64Util.encode(headimgurlDecode); 269 String imageEncode = Base64Util.encode(headimgurlDecode);
...@@ -272,7 +271,7 @@ public class UserOperationController { ...@@ -272,7 +271,7 @@ public class UserOperationController {
272 memberDTO.setAvatarUrl(StringUtils.isNotBlank(image) == true ? image:headimgurlDecode); 271 memberDTO.setAvatarUrl(StringUtils.isNotBlank(image) == true ? image:headimgurlDecode);
273 } 272 }
274 }catch (Exception e) { 273 }catch (Exception e) {
275 log.info("headimgurl , nickname ===>> encode error!"); 274 log.info("头像解析失败！！！");
276 e.printStackTrace(); 275 e.printStackTrace();
277 } 276 }
278 277
......
...@@ -94,6 +94,18 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -94,6 +94,18 @@ public class UserOperationServiceImpl implements UserOperationService {
94 @Value("${uc.app.appletAppid:wxc57d42de3d351cec}") 94 @Value("${uc.app.appletAppid:wxc57d42de3d351cec}")
95 private String appletAppid; 95 private String appletAppid;
96 96
97
98 @AsyncMqSend
99 public void asyncWeixinMemberAndUserWeixin4Iptv(MemberDTO memberDTO, UserWeixinDTO weixinDTO) {}
100 @AsyncMqSend
101 public void asyncMemberAndUserTv4Iptv(MemberDTO memberDTO, UserTvDTO userTvDTO) {}
102 @AsyncMqSend
103 public void asyncWeixin(UserWeixinDTO weixinDTO) {}
104 @AsyncMqSend
105 public void asyncUserTv(UserTvDTO userTvDTO) {}
106 @AsyncMqSend
107 public void asyncMember(MemberDTO memberDTO) {}
108
97 /** 109 /**
98 * 创建大屏账户同时创建会员 110 * 创建大屏账户同时创建会员
99 * 111 *
...@@ -101,8 +113,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -101,8 +113,7 @@ public class UserOperationServiceImpl implements UserOperationService {
101 * @return UserTvDTO 113 * @return UserTvDTO
102 */ 114 */
103 @Override 115 @Override
104 @Transactional 116 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
105 @AsyncMqSend
106 public UserTvDTO createTvUserAndMember(UserTv resources) { 117 public UserTvDTO createTvUserAndMember(UserTv resources) {
107 // 大屏账户 118 // 大屏账户
108 String platformAccount = resources.getPlatformAccount(); 119 String platformAccount = resources.getPlatformAccount();
...@@ -121,8 +132,11 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -121,8 +132,11 @@ public class UserOperationServiceImpl implements UserOperationService {
121 132
122 UserTv userTv = UserTvBuilder.build(memberDTO.getId(), memberDTO.getCode(), resources); 133 UserTv userTv = UserTvBuilder.build(memberDTO.getId(), memberDTO.getCode(), resources);
123 // 创建大屏账户 134 // 创建大屏账户
124 UserTvDTO tvUser = this.createTvUser(userTv, memberDTO.getId(), memberDTO.getCode()); 135 UserTvDTO tvUserDTO = this.createTvUser(userTv, memberDTO.getId(), memberDTO.getCode());
125 return tvUser; 136
137 this.asyncMemberAndUserTv4Iptv(memberDTO,tvUserDTO);
138
139 return tvUserDTO;
126 140
127 } 141 }
128 142
...@@ -141,7 +155,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -141,7 +155,6 @@ public class UserOperationServiceImpl implements UserOperationService {
141 */ 155 */
142 @Override 156 @Override
143 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) 157 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
144 @AsyncMqSend
145 public UserWeixinDTO createWeixinUserAndMember(UserWeixin resources) { 158 public UserWeixinDTO createWeixinUserAndMember(UserWeixin resources) {
146 159
147 String appId = resources.getAppid(); 160 String appId = resources.getAppid();
...@@ -166,7 +179,12 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -166,7 +179,12 @@ public class UserOperationServiceImpl implements UserOperationService {
166 if (Objects.nonNull(memberDTO)) { 179 if (Objects.nonNull(memberDTO)) {
167 resources.setMemberId(_userWeixinDTO.getMemberId()); 180 resources.setMemberId(_userWeixinDTO.getMemberId());
168 UserWeixin userWeixin = UserWeixinBuilder.build(resources); 181 UserWeixin userWeixin = UserWeixinBuilder.build(resources);
169 return this.createWeixinUser(userWeixin, memberDTO.getId(), memberDTO.getCode()); 182 UserWeixinDTO weixinDTO = this.createWeixinUser(userWeixin, memberDTO.getId(), memberDTO.getCode());
183
184 // 同步至iptv
185 this.asyncWeixinMemberAndUserWeixin4Iptv(memberDTO,weixinDTO);
186
187 return weixinDTO;
170 } 188 }
171 189
172 throw new EntityNotFoundException(MemberDTO.class,"code",GlobeExceptionMsg.MEMBER_CODE_IS_NULL); 190 throw new EntityNotFoundException(MemberDTO.class,"code",GlobeExceptionMsg.MEMBER_CODE_IS_NULL);
...@@ -181,7 +199,12 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -181,7 +199,12 @@ public class UserOperationServiceImpl implements UserOperationService {
181 199
182 if (Objects.nonNull(memberDTO)) { 200 if (Objects.nonNull(memberDTO)) {
183 UserWeixin userWeixin = UserWeixinBuilder.build(memberDTO.getId(), resources); 201 UserWeixin userWeixin = UserWeixinBuilder.build(memberDTO.getId(), resources);
184 return this.createWeixinUser(userWeixin, memberDTO.getId(), memberDTO.getCode()); 202 UserWeixinDTO _userWeixinDTO1 = this.createWeixinUser(userWeixin, memberDTO.getId(), memberDTO.getCode());
203
204 // 同步至iptv
205 this.asyncWeixinMemberAndUserWeixin4Iptv(memberDTO,_userWeixinDTO1);
206
207 return _userWeixinDTO1;
185 } 208 }
186 209
187 throw new EntityNotFoundException(MemberDTO.class,"code",GlobeExceptionMsg.MEMBER_CODE_IS_NULL); 210 throw new EntityNotFoundException(MemberDTO.class,"code",GlobeExceptionMsg.MEMBER_CODE_IS_NULL);
...@@ -190,6 +213,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -190,6 +213,7 @@ public class UserOperationServiceImpl implements UserOperationService {
190 213
191 } 214 }
192 215
216
193 /** 217 /**
194 * 服务号登录 218 * 服务号登录
195 * @param resources 219 * @param resources
...@@ -256,8 +280,10 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -256,8 +280,10 @@ public class UserOperationServiceImpl implements UserOperationService {
256 } else { 280 } else {
257 281
258 // 修改微信账户关注状态 282 // 修改微信账户关注状态
259 this.doUpdateUserWeiXinStatus(userWeixinDTO,SUBSCRIBE_STATUS); 283 UserWeixinDTO _userWeixinDTO = this.doUpdateUserWeiXinStatus(userWeixinDTO, SUBSCRIBE_STATUS);
260 284
285 // 同步至iptv
286 this.asyncWeixin(_userWeixinDTO);
261 } 287 }
262 288
263 // 大屏信息 289 // 大屏信息
...@@ -310,7 +336,10 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -310,7 +336,10 @@ public class UserOperationServiceImpl implements UserOperationService {
310 MemberDTO memberDTO = this.findMemberByUserWeixinDTO(userWeixinDTO); 336 MemberDTO memberDTO = this.findMemberByUserWeixinDTO(userWeixinDTO);
311 337
312 // 修改会员vip,如果没有购买会员则取消团粉 338 // 修改会员vip,如果没有购买会员则取消团粉
313 this.doUpdateMemberVip(memberDTO,0); 339 MemberDTO _memberDTO = this.doUpdateMemberVip(memberDTO, 0);
340
341 // 同步至iptv
342 this.asyncWeixinMemberAndUserWeixin4Iptv(_memberDTO,userWeixinDTO);
314 343
315 return true; 344 return true;
316 } 345 }
...@@ -379,8 +408,10 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -379,8 +408,10 @@ public class UserOperationServiceImpl implements UserOperationService {
379 } 408 }
380 409
381 // 设置主会员 410 // 设置主会员
382 this.bondPriorityMember(userTvDTO, memberCode,"manual"); 411 UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberCode, "manual");
383 412
413 // 同步至iptv
414 this.asyncUserTv(_userTvDTO);
384 } 415 }
385 416
386 /** 417 /**
...@@ -398,14 +429,16 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -398,14 +429,16 @@ public class UserOperationServiceImpl implements UserOperationService {
398 throw new EntityNotFoundException(UserTvDTO.class, "PlatformAccount", GlobeExceptionMsg.IPTV_IS_NULL); 429 throw new EntityNotFoundException(UserTvDTO.class, "PlatformAccount", GlobeExceptionMsg.IPTV_IS_NULL);
399 430
400 // 解绑（置空大屏信息） 431 // 解绑（置空大屏信息）
401 this.resetIptvColumn(this.findMemberByCode(memberCode)); 432 MemberDTO _memberDTO = this.resetIptvColumn(this.findMemberByCode(memberCode));
402 433
403 // 置空主账号 434 // 置空主账号
404 this.resetMainAccount(memberCode, userTvDTO.getId()); 435 UserTvDTO _userTvDTO = this.resetMainAccount(memberCode, userTvDTO.getId());
436
437 // 同步至iptv
438 this.asyncMemberAndUserTv4Iptv(_memberDTO, _userTvDTO);
405 } 439 }
406 440
407 @Override 441 @Override
408 @AsyncMqSend
409 public boolean deleteAllCollection(String content) { 442 public boolean deleteAllCollection(String content) {
410 try { 443 try {
411 444
...@@ -432,7 +465,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -432,7 +465,6 @@ public class UserOperationServiceImpl implements UserOperationService {
432 } 465 }
433 466
434 @Override 467 @Override
435 @AsyncMqSend
436 public boolean deleteCollection(String content) { 468 public boolean deleteCollection(String content) {
437 try { 469 try {
438 JSONObject jsonObject = JSONObject.parseObject(content); 470 JSONObject jsonObject = JSONObject.parseObject(content);
...@@ -494,7 +526,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -494,7 +526,6 @@ public class UserOperationServiceImpl implements UserOperationService {
494 } 526 }
495 527
496 @Override 528 @Override
497 @AsyncMqSend
498 public boolean addCollection(String content) { 529 public boolean addCollection(String content) {
499 try { 530 try {
500 //处理接口调用 中文不显示问题 531 //处理接口调用 中文不显示问题
...@@ -569,7 +600,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -569,7 +600,6 @@ public class UserOperationServiceImpl implements UserOperationService {
569 } 600 }
570 601
571 @Override 602 @Override
572 @AsyncMqSend
573 public boolean appletBind(BindBean resources) { 603 public boolean appletBind(BindBean resources) {
574 604
575 Long id = resources.getId(); 605 Long id = resources.getId();
...@@ -647,14 +677,21 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -647,14 +677,21 @@ public class UserOperationServiceImpl implements UserOperationService {
647 memberDTO.setPlatformAccount(platformAccount); 677 memberDTO.setPlatformAccount(platformAccount);
648 678
649 // 更新大屏账户 679 // 更新大屏账户
650 this.doUpdateUserTv(userTvDTO); 680 UserTvDTO _userTvDTO = this.doUpdateUserTv(userTvDTO);
651 // 修改会员信息 681 // 修改会员信息
652 this.doUpdateMemberByMemberDTO(memberDTO); 682 MemberDTO _memberDTO = this.doUpdateMemberByMemberDTO(memberDTO);
683
684 // 同步至iptv
685 this.asyncMemberAndUserTv4Iptv(_memberDTO, _userTvDTO);
653 686
654 return true; 687 return true;
655 } 688 }
656 689
657 690 /**
691 *
692 * @param memberCode
693 * @param platformAccount
694 */
658 @Override 695 @Override
659 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) 696 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
660 public void bind(String memberCode, String platformAccount) { 697 public void bind(String memberCode, String platformAccount) {
...@@ -699,9 +736,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -699,9 +736,6 @@ public class UserOperationServiceImpl implements UserOperationService {
699 // mq同步数据时使用 736 // mq同步数据时使用
700 memberDTO.setPlatformAccount(platformAccount); 737 memberDTO.setPlatformAccount(platformAccount);
701 738
702 // 大屏是否绑定主账号,如果绑定了主账户则不操作大屏账户表
703 this.bondPriorityMember(userTvDTO,memberDTO.getCode(),"auto");
704
705 // 构建小屏会员对象，绑定user_iptv_id字段 739 // 构建小屏会员对象，绑定user_iptv_id字段
706 String platform = userTvDTO.getPlatform(); 740 String platform = userTvDTO.getPlatform();
707 // 绑定IPTV平台 0：未知；1：电信；2：移动；3：联通 741 // 绑定IPTV平台 0：未知；1：电信；2：移动；3：联通
...@@ -723,8 +757,13 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -723,8 +757,13 @@ public class UserOperationServiceImpl implements UserOperationService {
723 memberDTO.setBindIptvPlatformType(bindIptvPlatformType); 757 memberDTO.setBindIptvPlatformType(bindIptvPlatformType);
724 memberDTO.setPlatformAccount(platformAccount); 758 memberDTO.setPlatformAccount(platformAccount);
725 759
760 // 大屏是否绑定主账号,如果绑定了主账户则不操作大屏账户表
761 UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberDTO.getCode(), "auto");
726 // 修改会员 762 // 修改会员
727 this.doUpdateMemberByMemberDTO(memberDTO); 763 MemberDTO _memberDTO = this.doUpdateMemberByMemberDTO(memberDTO);
764
765 // 同步至iptv
766 this.asyncMemberAndUserTv4Iptv(_memberDTO,_userTvDTO);
728 767
729 return null; 768 return null;
730 } 769 }
...@@ -742,7 +781,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -742,7 +781,7 @@ public class UserOperationServiceImpl implements UserOperationService {
742 /** 781 /**
743 * 修改会员vip状态 782 * 修改会员vip状态
744 */ 783 */
745 private void doUpdateMemberVip(MemberDTO memberDTO,Integer vip1) { 784 private MemberDTO doUpdateMemberVip(MemberDTO memberDTO,Integer vip1) {
746 if (memberDTO != null) { 785 if (memberDTO != null) {
747 Integer vip = memberDTO.getVip(); 786 Integer vip = memberDTO.getVip();
748 vip = (vip == null ? 0 : vip); 787 vip = (vip == null ? 0 : vip);
...@@ -754,8 +793,12 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -754,8 +793,12 @@ public class UserOperationServiceImpl implements UserOperationService {
754 Member member = new Member(); 793 Member member = new Member();
755 BeanUtils.copyProperties(memberDTO, member); 794 BeanUtils.copyProperties(memberDTO, member);
756 this.memberService.update(member); 795 this.memberService.update(member);
796
797 return memberDTO;
757 } 798 }
758 } 799 }
800
801 return null;
759 } 802 }
760 803
761 /** 804 /**
...@@ -799,7 +842,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -799,7 +842,7 @@ public class UserOperationServiceImpl implements UserOperationService {
799 * 修改微信公众号关注状态 842 * 修改微信公众号关注状态
800 * @param status 0:取消关注 1:关注 843 * @param status 0:取消关注 1:关注
801 */ 844 */
802 private UserWeixinDTO doUpdateUserWeiXinStatus(UserWeixinDTO userWeixinDTO, Integer status) { 845 public UserWeixinDTO doUpdateUserWeiXinStatus(UserWeixinDTO userWeixinDTO, Integer status) {
803 846
804 userWeixinDTO.setStatus(status); 847 userWeixinDTO.setStatus(status);
805 848
...@@ -808,7 +851,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -808,7 +851,6 @@ public class UserOperationServiceImpl implements UserOperationService {
808 851
809 this.userWeixinService.update(userWeixin); 852 this.userWeixinService.update(userWeixin);
810 853
811
812 return userWeixinDTO; 854 return userWeixinDTO;
813 855
814 } 856 }
...@@ -855,13 +897,13 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -855,13 +897,13 @@ public class UserOperationServiceImpl implements UserOperationService {
855 * @param memberCode 897 * @param memberCode
856 * @param auto manual:手动 auto:自动 898 * @param auto manual:手动 auto:自动
857 */ 899 */
858 private void bondPriorityMember(UserTvDTO userTvDTO, String memberCode,String auto) { 900 private UserTvDTO bondPriorityMember(UserTvDTO userTvDTO, String memberCode,String auto) {
859 901
860 if (auto.equalsIgnoreCase("auto")) { 902 if (auto.equalsIgnoreCase("auto")) {
861 // 主账户 903 // 主账户
862 String priorityMemberCode = userTvDTO.getPriorityMemberCode(); 904 String priorityMemberCode = userTvDTO.getPriorityMemberCode();
863 if (StringUtils.isNotEmpty(priorityMemberCode)) { 905 if (StringUtils.isNotEmpty(priorityMemberCode)) {
864 return; 906 return null;
865 } 907 }
866 } 908 }
867 909
...@@ -869,15 +911,25 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -869,15 +911,25 @@ public class UserOperationServiceImpl implements UserOperationService {
869 911
870 UserTv userTv = new UserTv(); 912 UserTv userTv = new UserTv();
871 BeanUtils.copyProperties(userTvDTO,userTv); 913 BeanUtils.copyProperties(userTvDTO,userTv);
872 this.userTvService.update(userTv); 914 UserTvDTO _userTvDTO = this.updateUserTv(userTv);
873 915
916 return _userTvDTO;
917 }
918
919 /**
920 *
921 * @param userTv
922 * @return
923 */
924 private UserTvDTO updateUserTv(UserTv userTv){
925 return this.userTvService.update(userTv);
874 } 926 }
875 927
876 /** 928 /**
877 * 重置主账号 929 * 重置主账号
878 * @param memberCode 930 * @param memberCode
879 */ 931 */
880 private void resetMainAccount(String memberCode, Long id) { 932 private UserTvDTO resetMainAccount(String memberCode, Long id) {
881 933
882 UserTvDTO userTvDTO = this.userTvService.findByPriorityMemberCode(memberCode); 934 UserTvDTO userTvDTO = this.userTvService.findByPriorityMemberCode(memberCode);
883 if (Objects.nonNull(userTvDTO)) { 935 if (Objects.nonNull(userTvDTO)) {
...@@ -900,8 +952,9 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -900,8 +952,9 @@ public class UserOperationServiceImpl implements UserOperationService {
900 }); 952 });
901 953
902 // 绑定新的主账号 954 // 绑定新的主账号
903 this.bondPriorityMember(userTvDTO, memberDTOS.get(0).getCode() , "manual"); 955 UserTvDTO _userTvDTO = this.bondPriorityMember(userTvDTO, memberDTOS.get(0).getCode(), "manual");
904 956
957 return _userTvDTO;
905 } 958 }
906 959
907 } else { 960 } else {
...@@ -911,30 +964,33 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -911,30 +964,33 @@ public class UserOperationServiceImpl implements UserOperationService {
911 UserTv userTv = new UserTv(); 964 UserTv userTv = new UserTv();
912 BeanUtils.copyProperties(userTvDTO,userTv); 965 BeanUtils.copyProperties(userTvDTO,userTv);
913 966
914 this.userTvService.unbindPriorityMemberCode(userTv); 967 UserTvDTO _userTvDTO = this.userTvService.unbindPriorityMemberCode(userTv);
915 968
969 return _userTvDTO;
916 } 970 }
917 971
918 } 972 }
919 973
974 return userTvDTO;
975
920 } 976 }
921 977
922 /** 978 /**
923 * 解绑（置空大屏信息） 979 * 解绑（置空大屏信息）
924 * @param memberDTOS 980 * @param memberDTOS
925 */ 981 */
926 private void resetIptvColumn(MemberDTO memberDTOS) { 982 private MemberDTO resetIptvColumn(MemberDTO memberDTOS) {
927 983
928 // 若无关系，不做处理 984 // 若无关系，不做处理
929 if (Objects.nonNull(memberDTOS) && Objects.isNull(memberDTOS.getUserIptvId())) 985 if (Objects.nonNull(memberDTOS) && Objects.isNull(memberDTOS.getUserIptvId()))
930 return; 986 return null;
931 987
932 Member member = new Member(); 988 Member member = new Member();
933 memberDTOS.setBindIptvTime(null); 989 memberDTOS.setBindIptvTime(null);
934 memberDTOS.setUserIptvId(null); 990 memberDTOS.setUserIptvId(null);
935 memberDTOS.setBindIptvPlatformType(null); 991 memberDTOS.setBindIptvPlatformType(null);
936 BeanUtils.copyProperties(memberDTOS, member); 992 BeanUtils.copyProperties(memberDTOS, member);
937 this.memberService.update(member); 993 return this.memberService.update(member);
938 } 994 }
939 995
940 /** 996 /**
...@@ -966,19 +1022,6 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -966,19 +1022,6 @@ public class UserOperationServiceImpl implements UserOperationService {
966 return this.memberService.update(member); 1022 return this.memberService.update(member);
967 } 1023 }
968 1024
969
970 /**
971 * 更新微信用户修改的时间
972 * @param userWeixinDTO
973 */
974 private void doUpdateUserWeiXinUpdateTime(UserWeixinDTO userWeixinDTO) {
975 UserWeixin userWeixin = new UserWeixin();
976 userWeixin.setAppid(userWeixinDTO.getAppid());
977 userWeixin.setOpenid(userWeixinDTO.getOpenid());
978 userWeixin.setUpdateTime(TimestampUtil.now());
979 this.userWeixinService.updateTime(userWeixin);
980 }
981
982 /** 1025 /**
983 * 1026 *
984 * @param unionId 1027 * @param unionId
...@@ -989,24 +1032,14 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -989,24 +1032,14 @@ public class UserOperationServiceImpl implements UserOperationService {
989 } 1032 }
990 1033
991 /** 1034 /**
992 * 通过id检索大屏信息
993 * @param userIptvId
994 * @return
995 */
996 private UserTvDTO findUserIptvById(Long userIptvId) {
997 UserTvDTO userTvDTO = this.userTvService.findById(userIptvId);
998 return userTvDTO;
999 }
1000
1001 /**
1002 * 更新大屏 1035 * 更新大屏
1003 * @param userTvDTO 1036 * @param userTvDTO
1004 */ 1037 */
1005 private void doUpdateUserTv(UserTvDTO userTvDTO) { 1038 private UserTvDTO doUpdateUserTv(UserTvDTO userTvDTO) {
1006 UserTv userTv = new UserTv(); 1039 UserTv userTv = new UserTv();
1007 BeanUtils.copyProperties(userTvDTO,userTv); 1040 BeanUtils.copyProperties(userTvDTO,userTv);
1008 userTv.setUpdateTime(TimestampUtil.now()); 1041 userTv.setUpdateTime(TimestampUtil.now());
1009 this.userTvService.update(userTv); 1042 return this.userTvService.update(userTv);
1010 } 1043 }
1011 1044
1012 /** 1045 /**
...@@ -1102,14 +1135,16 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -1102,14 +1135,16 @@ public class UserOperationServiceImpl implements UserOperationService {
1102 if (Objects.nonNull(memberId)) resource.setMemberId(memberId); 1135 if (Objects.nonNull(memberId)) resource.setMemberId(memberId);
1103 if (StringUtils.isNotBlank(memberCode)) resource.setMemberCode(memberCode); 1136 if (StringUtils.isNotBlank(memberCode)) resource.setMemberCode(memberCode);
1104 1137
1105 UserWeixin userWeixin = this.userWeixinService.create(resource); 1138 UserWeixinDTO userWeixinDTO = this.userWeixinService.create(resource);
1106 1139
1107 UserWeixinDTO userWeixinDTO = new UserWeixinDTO();
1108 BeanUtils.copyProperties(userWeixin,userWeixinDTO);
1109 return userWeixinDTO; 1140 return userWeixinDTO;
1110 } 1141 }
1111 1142
1112 1143 /**
1144 *
1145 * @param memberDTO
1146 * @return
1147 */
1113 @Override 1148 @Override
1114 public UserTvDTO checkBind(MemberDTO memberDTO) { 1149 public UserTvDTO checkBind(MemberDTO memberDTO) {
1115 MemberDTO memberDTO1 = this.memberService.findByCode(memberDTO.getCode()); 1150 MemberDTO memberDTO1 = this.memberService.findByCode(memberDTO.getCode());
...@@ -1120,6 +1155,11 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -1120,6 +1155,11 @@ public class UserOperationServiceImpl implements UserOperationService {
1120 return null; 1155 return null;
1121 } 1156 }
1122 1157
1158 /**
1159 *
1160 * @param platformAccount
1161 * @return
1162 */
1123 @Override 1163 @Override
1124 public UserTvDTO findByPlatformAccount(String platformAccount) { 1164 public UserTvDTO findByPlatformAccount(String platformAccount) {
1125 return this.userTvService.findByPlatformAccount(platformAccount); 1165 return this.userTvService.findByPlatformAccount(platformAccount);
......
...@@ -45,7 +45,6 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -45,7 +45,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
45 @Autowired 45 @Autowired
46 private ThreadPoolTaskExecutor threadPoolTaskExecutor; 46 private ThreadPoolTaskExecutor threadPoolTaskExecutor;
47 47
48 @AsyncMqSend
49 @CachePut(key = "#resources.memberId") 48 @CachePut(key = "#resources.memberId")
50 @Override 49 @Override
51 public MemberDTO buyVip(BuyVipBean resources) { 50 public MemberDTO buyVip(BuyVipBean resources) {
...@@ -101,7 +100,6 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -101,7 +100,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
101 return memberDTO; 100 return memberDTO;
102 } 101 }
103 102
104 @AsyncMqSend
105 @Override 103 @Override
106 public void createVipHistory(MemberVipHistory memberVipHistory){ 104 public void createVipHistory(MemberVipHistory memberVipHistory){
107 this.memberVipHistoryService.create(memberVipHistory); 105 this.memberVipHistoryService.create(memberVipHistory);
...@@ -166,7 +164,6 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -166,7 +164,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
166 return this.update(member); 164 return this.update(member);
167 } 165 }
168 166
169 @AsyncMqSend
170 @Override 167 @Override
171 public MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid) { 168 public MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid) {
172 169
...@@ -205,7 +202,7 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -205,7 +202,7 @@ public class MemberOperationServiceImpl implements MemberOperationService {
205 this.threadPoolTaskExecutor.execute(()->{ 202 this.threadPoolTaskExecutor.execute(()->{
206 Member member = new Member(); 203 Member member = new Member();
207 BeanUtils.copyProperties(memberDTO1,member); 204 BeanUtils.copyProperties(memberDTO1,member);
208 this.memberService.update(member); 205 this.update(member);
209 }); 206 });
210 207
211 vip = memberDTO1.getVip(); 208 vip = memberDTO1.getVip();
......
...@@ -37,6 +37,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation ...@@ -37,6 +37,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
37 } 37 }
38 38
39 @Override 39 @Override
40 @AsyncMqSend
40 public MemberProfile create(MemberProfile resources) { 41 public MemberProfile create(MemberProfile resources) {
41 return this.memberProfileService.create(resources); 42 return this.memberProfileService.create(resources);
42 } 43 }
...@@ -83,8 +84,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation ...@@ -83,8 +84,7 @@ public class MemberProfileOperationServiceImpl implements MemberProfileOperation
83 String memberCode = resources.getMemberCode(); 84 String memberCode = resources.getMemberCode();
84 MemberDTO memberDTO = null; 85 MemberDTO memberDTO = null;
85 if (StringUtils.isEmpty(memberCode)) { 86 if (StringUtils.isEmpty(memberCode)) {
86 Long memberId = resources.getMemberId(); 87 memberDTO = this.memberOperationService.findByCode(memberCode);
87 memberDTO = this.memberOperationService.findById(memberId);
88 resources.setMemberCode(memberDTO.getCode()); 88 resources.setMemberCode(memberDTO.getCode());
89 } 89 }
90 90
......
1 package com.topdraw.business.process.service.impl.member; 1 package com.topdraw.business.process.service.impl.member;
2 2
3 import com.topdraw.aspect.AsyncMqSend;
3 import com.topdraw.business.module.member.domain.Member; 4 import com.topdraw.business.module.member.domain.Member;
4 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo; 5 import com.topdraw.business.module.member.relatedinfo.domain.MemberRelatedInfo;
5 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService; 6 import com.topdraw.business.module.member.relatedinfo.service.MemberRelatedInfoService;
...@@ -29,16 +30,19 @@ public class MemberRelatedInfoOperationServiceImpl implements MemberRelatedInfoO ...@@ -29,16 +30,19 @@ public class MemberRelatedInfoOperationServiceImpl implements MemberRelatedInfoO
29 } 30 }
30 31
31 @Override 32 @Override
33 @AsyncMqSend
32 public MemberRelatedInfoDTO create(MemberRelatedInfo resources) { 34 public MemberRelatedInfoDTO create(MemberRelatedInfo resources) {
33 return this.memberRelatedInfoService.create(resources); 35 return this.memberRelatedInfoService.create(resources);
34 } 36 }
35 37
36 @Override 38 @Override
39 @AsyncMqSend
37 public MemberRelatedInfoDTO update(MemberRelatedInfo resources) { 40 public MemberRelatedInfoDTO update(MemberRelatedInfo resources) {
38 return this.memberRelatedInfoService.update(resources); 41 return this.memberRelatedInfoService.update(resources);
39 } 42 }
40 43
41 @Override 44 @Override
45 @AsyncMqSend
42 public void delete(Long id) { 46 public void delete(Long id) {
43 this.memberRelatedInfoService.delete(id); 47 this.memberRelatedInfoService.delete(id);
44 } 48 }
......