1.优化

@@ -44,21 +44,33 @@ public class MemberBuilder {
         member.setDueCouponAmount(DEFAULT_VALUE);
         member.setBlackStatus(DEFAULT_VALUE);
         member.setBirthday(StringUtils.isBlank(member.getBirthday())?"1900-01-01":member.getBirthday());
-        String nickname = member.getNickname();
+        /*String nickname = member.getNickname();
         if (StringUtils.isNotEmpty(nickname)) {
             String base64Nickname = new String(Base64.getEncoder().encode(nickname.getBytes(StandardCharsets.UTF_8)));
             member.setNickname(base64Nickname);
-        }
+        }*/
         return member;
     }
 
-   public static Member build(Integer type,String avatarUrl,String nickname,int vip){
+   public static Member build(Integer type, String avatarUrl, String nickname, int vip){
+        // todo 原型模式
+       Member member = new Member();
+       member.setType(type);
+       member.setAvatarUrl(avatarUrl);
+       member.setNickname(nickname);
+       member.setVip(vip);
+       Member _member = checkMemberData(member);
+       return _member;
+    }
+
+    public static Member build(Integer type, String avatarUrl, String nickname, int vip, Integer sex){
         // todo 原型模式
         Member member = new Member();
         member.setType(type);
         member.setAvatarUrl(avatarUrl);
         member.setNickname(nickname);
         member.setVip(vip);
+        member.setGender(Objects.isNull(sex) == true ? -1:sex);
         Member _member = checkMemberData(member);
         return _member;
     }

@@ -169,6 +169,9 @@ public class UserOperationServiceImpl implements UserOperationService {
         String appId = resources.getAppid();
         String openId = resources.getOpenid();
         String unionId = resources.getUnionid();
+        String nickname = resources.getNickname();
+        String headimgurl = resources.getHeadimgurl();
+        Integer sex = resources.getSex();
 
         // 检查小屏账户是否存在
         UserWeixinDTO userWeixinDTO = this.findFirstByUnionIdAndAppIdAndOpenId(unionId,appId, openId);
@@ -203,7 +206,7 @@ public class UserOperationServiceImpl implements UserOperationService {
             // 新建会员
             Member _member =
                     MemberBuilder.build(LocalConstants.MEMBER_PLATFORM_TYPE_WEIXIN,
-                            null, "", 0);
+                            headimgurl, nickname, 0, sex);
             MemberDTO memberDTO = this.createMember(_member);
 
             if (Objects.nonNull(memberDTO)) {
@@ -211,7 +214,7 @@ public class UserOperationServiceImpl implements UserOperationService {
                 UserWeixinDTO _userWeixinDTO1 = this.createWeixinUser(userWeixin, memberDTO.getId(), memberDTO.getCode());
 
                 // 同步至iptv
-                ((UserOperationServiceImpl)AopContext.currentProxy()).asyncMemberAndUserWeixin4Iptv(new MemberAndWeixinUserDTO(memberDTO, _userWeixinDTO1));
+                //((UserOperationServiceImpl)AopContext.currentProxy()).asyncMemberAndUserWeixin4Iptv(new MemberAndWeixinUserDTO(memberDTO, _userWeixinDTO1));
 
                 return _userWeixinDTO1;
             }

@@ -17,6 +17,7 @@ import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
+import java.sql.Timestamp;
 import java.util.concurrent.FutureTask;
 
 public class UserOperationControllerTest extends BaseTest {
@@ -102,14 +103,17 @@ public class UserOperationControllerTest extends BaseTest {
     @Test
     public void createWeixinUserAndMember() {
         try {
-            String a = "{\n" +
-                    "\"unionid\":\"oqDha5idQxR0WGPW2qHi-meGM6Ck\",\n" +
-                    "\"appid\":\"wxfaa765183a332521\", \n" +
-                    "\"openid\":\"oxgff4oMXi0TSez6kYxEao98emFE\", \n" +
-                    "\"authTime\":\"2022-03-22 20:10:43.47\"\n" +
-                    "}";
-            UserWeixin parse = JSONObject.parseObject(a, UserWeixin.class);
-            ResultInfo weixinUserAndMember = this.userOperationController.createWeixinUserAndMember(parse);
+            // 初始化账号
+            UserWeixin userWeixinNew = new UserWeixin().setAppid("1").setOpenid("1").setUnionid("1")
+                    .setNickname("1").setHeadimgurl("1").setSex(1);
+            userWeixinNew.setAuthTime(new Timestamp(System.currentTimeMillis()));
+            userWeixinNew.setSourceType(null);
+            userWeixinNew.setSourceId(null);
+            userWeixinNew.setSourceDesc(null);
+            userWeixinNew.setSourceUser(null);
+            userWeixinNew.setSourceEntity(null);
+//            UserWeixin parse = JSONObject.parseObject(a, UserWeixin.class);
+            ResultInfo weixinUserAndMember = this.userOperationController.createWeixinUserAndMember(userWeixinNew);
             System.out.println(weixinUserAndMember);
         } catch (Exception e) {
             e.printStackTrace();