Skip to content

张云鹏 / uc-engine

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 46fb1e4c 46fb1e4c6a18681ac341856018e5de2adfae91a3 by xianghan
Options

1.优化

1 parent 697ec438
Inline Side-by-side
Showing 3 changed files with 32 additions and 13 deletions
...@@ -44,21 +44,33 @@ public class MemberBuilder { ...@@ -44,21 +44,33 @@ public class MemberBuilder {
44 member.setDueCouponAmount(DEFAULT_VALUE); 44 member.setDueCouponAmount(DEFAULT_VALUE);
45 member.setBlackStatus(DEFAULT_VALUE); 45 member.setBlackStatus(DEFAULT_VALUE);
46 member.setBirthday(StringUtils.isBlank(member.getBirthday())?"1900-01-01":member.getBirthday()); 46 member.setBirthday(StringUtils.isBlank(member.getBirthday())?"1900-01-01":member.getBirthday());
47 String nickname = member.getNickname(); 47 /*String nickname = member.getNickname();
48 if (StringUtils.isNotEmpty(nickname)) { 48 if (StringUtils.isNotEmpty(nickname)) {
49 String base64Nickname = new String(Base64.getEncoder().encode(nickname.getBytes(StandardCharsets.UTF_8))); 49 String base64Nickname = new String(Base64.getEncoder().encode(nickname.getBytes(StandardCharsets.UTF_8)));
50 member.setNickname(base64Nickname); 50 member.setNickname(base64Nickname);
51 } 51 }*/
52 return member; 52 return member;
53 } 53 }
54 54
55 public static Member build(Integer type,String avatarUrl,String nickname,int vip){ 55 public static Member build(Integer type, String avatarUrl, String nickname, int vip){
56 // todo 原型模式
57 Member member = new Member();
58 member.setType(type);
59 member.setAvatarUrl(avatarUrl);
60 member.setNickname(nickname);
61 member.setVip(vip);
62 Member _member = checkMemberData(member);
63 return _member;
64 }
65
66 public static Member build(Integer type, String avatarUrl, String nickname, int vip, Integer sex){
56 // todo 原型模式 67 // todo 原型模式
57 Member member = new Member(); 68 Member member = new Member();
58 member.setType(type); 69 member.setType(type);
59 member.setAvatarUrl(avatarUrl); 70 member.setAvatarUrl(avatarUrl);
60 member.setNickname(nickname); 71 member.setNickname(nickname);
61 member.setVip(vip); 72 member.setVip(vip);
73 member.setGender(Objects.isNull(sex) == true ? -1:sex);
62 Member _member = checkMemberData(member); 74 Member _member = checkMemberData(member);
63 return _member; 75 return _member;
64 } 76 }
......
...@@ -169,6 +169,9 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -169,6 +169,9 @@ public class UserOperationServiceImpl implements UserOperationService {
169 String appId = resources.getAppid(); 169 String appId = resources.getAppid();
170 String openId = resources.getOpenid(); 170 String openId = resources.getOpenid();
171 String unionId = resources.getUnionid(); 171 String unionId = resources.getUnionid();
172 String nickname = resources.getNickname();
173 String headimgurl = resources.getHeadimgurl();
174 Integer sex = resources.getSex();
172 175
173 // 检查小屏账户是否存在 176 // 检查小屏账户是否存在
174 UserWeixinDTO userWeixinDTO = this.findFirstByUnionIdAndAppIdAndOpenId(unionId,appId, openId); 177 UserWeixinDTO userWeixinDTO = this.findFirstByUnionIdAndAppIdAndOpenId(unionId,appId, openId);
...@@ -203,7 +206,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -203,7 +206,7 @@ public class UserOperationServiceImpl implements UserOperationService {
203 // 新建会员 206 // 新建会员
204 Member _member = 207 Member _member =
205 MemberBuilder.build(LocalConstants.MEMBER_PLATFORM_TYPE_WEIXIN, 208 MemberBuilder.build(LocalConstants.MEMBER_PLATFORM_TYPE_WEIXIN,
206 null, "", 0); 209 headimgurl, nickname, 0, sex);
207 MemberDTO memberDTO = this.createMember(_member); 210 MemberDTO memberDTO = this.createMember(_member);
208 211
209 if (Objects.nonNull(memberDTO)) { 212 if (Objects.nonNull(memberDTO)) {
...@@ -211,7 +214,7 @@ public class UserOperationServiceImpl implements UserOperationService { ...@@ -211,7 +214,7 @@ public class UserOperationServiceImpl implements UserOperationService {
211 UserWeixinDTO _userWeixinDTO1 = this.createWeixinUser(userWeixin, memberDTO.getId(), memberDTO.getCode()); 214 UserWeixinDTO _userWeixinDTO1 = this.createWeixinUser(userWeixin, memberDTO.getId(), memberDTO.getCode());
212 215
213 // 同步至iptv 216 // 同步至iptv
214 ((UserOperationServiceImpl)AopContext.currentProxy()).asyncMemberAndUserWeixin4Iptv(new MemberAndWeixinUserDTO(memberDTO, _userWeixinDTO1)); 217 //((UserOperationServiceImpl)AopContext.currentProxy()).asyncMemberAndUserWeixin4Iptv(new MemberAndWeixinUserDTO(memberDTO, _userWeixinDTO1));
215 218
216 return _userWeixinDTO1; 219 return _userWeixinDTO1;
217 } 220 }
......
...@@ -17,6 +17,7 @@ import org.junit.Test; ...@@ -17,6 +17,7 @@ import org.junit.Test;
17 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
18 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; 18 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
19 19
20 import java.sql.Timestamp;
20 import java.util.concurrent.FutureTask; 21 import java.util.concurrent.FutureTask;
21 22
22 public class UserOperationControllerTest extends BaseTest { 23 public class UserOperationControllerTest extends BaseTest {
...@@ -102,14 +103,17 @@ public class UserOperationControllerTest extends BaseTest { ...@@ -102,14 +103,17 @@ public class UserOperationControllerTest extends BaseTest {
102 @Test 103 @Test
103 public void createWeixinUserAndMember() { 104 public void createWeixinUserAndMember() {
104 try { 105 try {
105 String a = "{\n" + 106 // 初始化账号
106 "\"unionid\":\"oqDha5idQxR0WGPW2qHi-meGM6Ck\",\n" + 107 UserWeixin userWeixinNew = new UserWeixin().setAppid("1").setOpenid("1").setUnionid("1")
107 "\"appid\":\"wxfaa765183a332521\", \n" + 108 .setNickname("1").setHeadimgurl("1").setSex(1);
108 "\"openid\":\"oxgff4oMXi0TSez6kYxEao98emFE\", \n" + 109 userWeixinNew.setAuthTime(new Timestamp(System.currentTimeMillis()));
109 "\"authTime\":\"2022-03-22 20:10:43.47\"\n" + 110 userWeixinNew.setSourceType(null);
110 "}"; 111 userWeixinNew.setSourceId(null);
111 UserWeixin parse = JSONObject.parseObject(a, UserWeixin.class); 112 userWeixinNew.setSourceDesc(null);
112 ResultInfo weixinUserAndMember = this.userOperationController.createWeixinUserAndMember(parse); 113 userWeixinNew.setSourceUser(null);
114 userWeixinNew.setSourceEntity(null);
115 // UserWeixin parse = JSONObject.parseObject(a, UserWeixin.class);
116 ResultInfo weixinUserAndMember = this.userOperationController.createWeixinUserAndMember(userWeixinNew);
113 System.out.println(weixinUserAndMember); 117 System.out.println(weixinUserAndMember);
114 } catch (Exception e) { 118 } catch (Exception e) {
115 e.printStackTrace(); 119 e.printStackTrace();
......