From 072d31e8df8a8cb9710dcbdce4efda61a3729f23 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Wed, 26 Apr 2023 05:58:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili/modules/member/entity/dos/Member.java   | 16 +---------------
 .../member/serviceimpl/MemberServiceImpl.java    |  6 +++---
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
index 964d3f66..b39565fc 100644
--- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
+++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java
@@ -110,7 +110,7 @@ public class Member extends BaseEntity {
         this.lastLoginDate = new Date();
     }
 
-    public Member(String username, String password, String mobile, String nickName, String face) {
+    public Member(String username, String password, String face, String nickName, Integer sex,String mobile) {
         this.username = username;
         this.password = password;
         this.mobile = mobile;
@@ -118,20 +118,6 @@ public class Member extends BaseEntity {
         this.disabled = true;
         this.haveStore = false;
         this.face = face;
-        this.sex = 0;
-        this.point = 0L;
-        this.totalPoint = 0L;
-        this.lastLoginDate = new Date();
-    }
-
-    public Member(String username, String password, String face, String nickName, Integer sex) {
-        this.username = username;
-        this.password = password;
-        this.mobile = "";
-        this.nickName = nickName;
-        this.disabled = true;
-        this.haveStore = false;
-        this.face = face;
         this.sex = sex;
         this.point = 0L;
         this.totalPoint = 0L;
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index a798bc4d..3407253e 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -247,9 +247,9 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
             authUser.setAvatar("https://i.loli.net/2020/11/19/LyN6JF7zZRskdIe.png");
         }
         try {
-            String username = UuidUtils.getUUID();
-            Member member = new Member(username, UuidUtils.getUUID(), authUser.getAvatar(), authUser.getNickname(),
-                    authUser.getGender() != null ? Convert.toInt(authUser.getGender().getCode()) : 0);
+//            String username = UuidUtils.getUUID();
+            Member member = new Member(authUser.getUsername(), UuidUtils.getUUID(), authUser.getAvatar(), authUser.getNickname(),
+                    authUser.getGender() != null ? Convert.toInt(authUser.getGender().getCode()) : 0,authUser.getPhone());
             member.setPassword(DEFAULT_PASSWORD);
             // 发送会员注册信息
             registerHandler(member);