Skip to content

向汉 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 5f40ee67 5f40ee67262947d6841878c40f0a7533146dff3c by xianghan
Options

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

1 parent c8ae983f
Inline Side-by-side
Showing 5 changed files with 51 additions and 24 deletions
1 ALTER TABLE `uc_user_tv`
2 ADD COLUMN `vis_user_id` bigint(20) NULL DEFAULT NULL COMMENT 'vis_user表主键' AFTER `platform_account`;
...\ No newline at end of file ...\ No newline at end of file
...@@ -6,6 +6,7 @@ import com.topdraw.business.module.common.validated.UpdateGroup; ...@@ -6,6 +6,7 @@ import com.topdraw.business.module.common.validated.UpdateGroup;
6 import com.topdraw.business.module.member.domain.Member; 6 import com.topdraw.business.module.member.domain.Member;
7 import com.topdraw.business.module.member.service.MemberService; 7 import com.topdraw.business.module.member.service.MemberService;
8 import com.topdraw.business.module.user.iptv.domain.UserTv; 8 import com.topdraw.business.module.user.iptv.domain.UserTv;
9 import com.topdraw.business.process.service.MemberOperationService;
9 import com.topdraw.business.process.service.UserOperationService; 10 import com.topdraw.business.process.service.UserOperationService;
10 import com.topdraw.common.ResultInfo; 11 import com.topdraw.common.ResultInfo;
11 import io.swagger.annotations.Api; 12 import io.swagger.annotations.Api;
...@@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
27 public class MemberController { 28 public class MemberController {
28 29
29 @Autowired 30 @Autowired
30 private MemberService memberService; 31 private MemberOperationService memberOperationService;
31 @Autowired 32 @Autowired
32 private UserOperationService userTvOperationService; 33 private UserOperationService userTvOperationService;
33 34
...@@ -48,7 +49,7 @@ public class MemberController { ...@@ -48,7 +49,7 @@ public class MemberController {
48 @ApiOperation("手动修改vip") 49 @ApiOperation("手动修改vip")
49 public ResultInfo doUpdateVipByCode(@Validated(value = {UpdateGroup.class}) @RequestBody Member resources) { 50 public ResultInfo doUpdateVipByCode(@Validated(value = {UpdateGroup.class}) @RequestBody Member resources) {
50 log.info("member ==>> doUpdateVipByCode ==>> param ==>> [{}]",resources); 51 log.info("member ==>> doUpdateVipByCode ==>> param ==>> [{}]",resources);
51 memberService.update(resources); 52 this.memberOperationService.update(resources);
52 log.info("member ==>> doUpdateVipByCode ==>> result ==>> [{}]",resources); 53 log.info("member ==>> doUpdateVipByCode ==>> result ==>> [{}]",resources);
53 return ResultInfo.success(); 54 return ResultInfo.success();
54 } 55 }
......
1 package com.topdraw.business.module.member.service.impl; 1 package com.topdraw.business.module.member.service.impl;
2 2
3 import com.topdraw.aspect.AsyncMqSend;
4 import com.topdraw.business.module.member.domain.Member; 3 import com.topdraw.business.module.member.domain.Member;
5 import com.topdraw.business.module.member.domain.MemberBuilder; 4 import com.topdraw.business.module.member.domain.MemberBuilder;
6 import com.topdraw.business.module.member.profile.service.MemberProfileService; 5 import com.topdraw.business.module.member.profile.service.MemberProfileService;
...@@ -101,7 +100,6 @@ public class MemberServiceImpl implements MemberService { ...@@ -101,7 +100,6 @@ public class MemberServiceImpl implements MemberService {
101 100
102 @Override 101 @Override
103 @Transactional(rollbackFor = Exception.class) 102 @Transactional(rollbackFor = Exception.class)
104 @AsyncMqSend()
105 public Long create(Member resources) { 103 public Long create(Member resources) {
106 104
107 Member member = MemberBuilder.build(resources); 105 Member member = MemberBuilder.build(resources);
...@@ -117,7 +115,6 @@ public class MemberServiceImpl implements MemberService { ...@@ -117,7 +115,6 @@ public class MemberServiceImpl implements MemberService {
117 115
118 @Override 116 @Override
119 @Transactional(rollbackFor = Exception.class) 117 @Transactional(rollbackFor = Exception.class)
120 @AsyncMqSend()
121 public Member createAndReturnMember(Member resources) { 118 public Member createAndReturnMember(Member resources) {
122 119
123 this.create(MemberBuilder.build(resources)); 120 this.create(MemberBuilder.build(resources));
...@@ -128,7 +125,6 @@ public class MemberServiceImpl implements MemberService { ...@@ -128,7 +125,6 @@ public class MemberServiceImpl implements MemberService {
128 125
129 @Override 126 @Override
130 @Transactional(rollbackFor = Exception.class) 127 @Transactional(rollbackFor = Exception.class)
131 @AsyncMqSend()
132 public void update(Member resources) { 128 public void update(Member resources) {
133 129
134 log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources); 130 log.info("MemberServiceImpl ==>> update ==>> resources ==>> [{}]" , resources);
...@@ -160,7 +156,6 @@ public class MemberServiceImpl implements MemberService { ...@@ -160,7 +156,6 @@ public class MemberServiceImpl implements MemberService {
160 156
161 @Override 157 @Override
162 @Transactional(rollbackFor = Exception.class) 158 @Transactional(rollbackFor = Exception.class)
163 @AsyncMqSend()
164 public void doUpdateMemberPoints(Member resources) { 159 public void doUpdateMemberPoints(Member resources) {
165 RLock rLock = this.redissonClient.getLock("member::update::code" + resources.getId().toString()); 160 RLock rLock = this.redissonClient.getLock("member::update::code" + resources.getId().toString());
166 try { 161 try {
......
...@@ -7,20 +7,61 @@ import com.topdraw.business.process.domian.weixin.BuyVipBean; ...@@ -7,20 +7,61 @@ import com.topdraw.business.process.domian.weixin.BuyVipBean;
7 7
8 public interface MemberOperationService { 8 public interface MemberOperationService {
9 9
10 /**
11 *
12 * @param member
13 */
10 void doUpdateMemberInfo(Member member); 14 void doUpdateMemberInfo(Member member);
11 15
16 /**
17 *
18 * @param member
19 */
12 void doInsertMember(Member member); 20 void doInsertMember(Member member);
13 21
22 /**
23 *
24 * @param memberId
25 * @return
26 */
14 MemberDTO findById(Long memberId); 27 MemberDTO findById(Long memberId);
15 28
29 /**
30 *
31 * @param member
32 */
16 void doUpdateMemberExp(Member member); 33 void doUpdateMemberExp(Member member);
17 34
35 /**
36 *
37 * @param member
38 */
18 void doUpdateMemberPoints(Member member); 39 void doUpdateMemberPoints(Member member);
19 40
41 /**
42 *
43 * @param member
44 */
20 void doUpdateMemberCoupon(Member member); 45 void doUpdateMemberCoupon(Member member);
21 46
47 /**
48 *
49 * @param memberId
50 * @param appid
51 * @return
52 */
22 MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid); 53 MemberProfileDTO getMemberProfileAndCheckVip(Long memberId, String appid);
23 54
55 /**
56 *
57 * @param buyVipBean
58 * @return
59 */
24 MemberDTO buyVip(BuyVipBean buyVipBean); 60 MemberDTO buyVip(BuyVipBean buyVipBean);
25 61
62 /**
63 * 修改会员
64 * @param resources
65 */
66 void update(Member resources);
26 } 67 }
......
...@@ -75,23 +75,6 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -75,23 +75,6 @@ public class MemberOperationServiceImpl implements MemberOperationService {
75 memberDTO.setVip(vip1); 75 memberDTO.setVip(vip1);
76 memberDTO.setVipExpireTime(vipExpireTime); 76 memberDTO.setVipExpireTime(vipExpireTime);
77 77
78 /*if (){
79 //购买过 判断当前时间有没有过vip过期时间，没有过，失效时间加一年; 过了，当前时间加一年
80 //区分是当前vip续费 还是买新的vip
81 if (ObjectUtil.equal(vip1, memberDTO.getVip())) {
82 if (now.isBefore(vipExpireTime)) {
83 LocalDateTime localDateTime = vipExpireTime.plusYears(1L);
84 memberDTO.setVipExpireTime(localDateTime);
85 } else {
86 LocalDateTime localDateTime = now.plusYears(1L);
87 memberDTO.setVipExpireTime(localDateTime);
88 }
89 } else {
90 LocalDateTime localDateTime = now.plusYears(1L);
91 memberDTO.setVipExpireTime(localDateTime);
92 }
93 }*/
94
95 Member member = new Member(); 78 Member member = new Member();
96 BeanUtils.copyProperties(memberDTO,member); 79 BeanUtils.copyProperties(memberDTO,member);
97 this.memberService.create(member); 80 this.memberService.create(member);
...@@ -107,6 +90,11 @@ public class MemberOperationServiceImpl implements MemberOperationService { ...@@ -107,6 +90,11 @@ public class MemberOperationServiceImpl implements MemberOperationService {
107 return memberDTO; 90 return memberDTO;
108 } 91 }
109 92
93 @Override
94 public void update(Member resources) {
95 this.memberService.update(resources);
96 }
97
110 private UserWeixinDTO findWeiXinById(Long id) { 98 private UserWeixinDTO findWeiXinById(Long id) {
111 UserWeixinDTO userWeixinDTO = this.userWeixinService.findById(id); 99 UserWeixinDTO userWeixinDTO = this.userWeixinService.findById(id);
112 if (Objects.isNull(userWeixinDTO)) { 100 if (Objects.isNull(userWeixinDTO)) {
......