From 99a798923e06c7961103261488cffcc988f4de91 Mon Sep 17 00:00:00 2001
From: chenlin <chenlin@deovo.net>
Date: Sat, 6 Jul 2024 17:24:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=97=B6=E9=82=80=E8=AF=B7=E4=BA=BA=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E9=97=A8=E5=BA=97=E4=B8=BA=E7=A9=BA=E5=88=99=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9A=84=E6=83=85=E5=86=B5=EF=BC=9B=202.?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=BA=97=E5=91=98=E5=85=91=E6=8D=A2=E7=A0=81?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=8F=AA=E8=A6=81=E6=9B=BE=E7=BB=8F?=
 =?UTF-8?q?=E5=BC=80=E9=80=9A=E8=BF=87=E4=BC=9A=E5=91=98=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=83=BD=E5=8F=AF=E4=BB=A5=E9=A2=86=E5=8F=96=EF=BC=9B?=
 =?UTF-8?q?=203.=E5=BC=80=E9=80=9A=E4=BC=9A=E5=91=98=E6=97=B6=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E4=BC=98=E6=83=A0=E5=88=B8=E6=9D=A1=E4=BB=B6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E5=8F=AA=E8=A6=81=E6=9B=BE=E7=BB=8F=E5=BC=80?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BC=9A=E5=91=98=E7=9A=84=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=83=BD=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8=E5=B7=B2=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/account.go        | 35 ++++++++++++++++++-----------------
 controller/user.go           |  4 +++-
 pack/configs/dev/server.json |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/controller/account.go b/controller/account.go
index f705a9d..b7e907f 100644
--- a/controller/account.go
+++ b/controller/account.go
@@ -230,11 +230,12 @@ func AuthLogin(c *gin.Context) {
 		inviteUser := model.GetUserByUid(req.InviteUid)
 		effectiveStoreInfo, err := model.GetUserEffectiveStore(req.InviteUid)
 		if err != nil {
-			RespJson(c, status.InviteUserFail, nil)
-			return
+			//RespJson(c, status.InviteUserFail, nil)
+			//return
+			logger.Error("login GetUserEffectiveStore err")
 		}
 
-		if user.StoreId == 0 { // 用户所属门店id为空则更新
+		if user.StoreId == 0 && effectiveStoreInfo.StoreID != 0 { // 用户所属门店id为空则更新
 			_, err = model.NewUserQuerySet(model.DB).UidEq(user.Uid).GetUpdater().SetStoreId(effectiveStoreInfo.StoreID).
 				UpdateNum()
 			if err != nil {
@@ -253,8 +254,8 @@ func AuthLogin(c *gin.Context) {
 					user.Uid, req.InviteUid))
 			if err != nil {
 				logger.Error("query err:", err)
-				RespJson(c, status.InternalServerError, nil)
-				return
+				//RespJson(c, status.InternalServerError, nil)
+				//return
 			}
 			if !exist { // 未邀请过，则添加邀请记录：首次邀请记录
 				firstInviteRecord := &model.UserInviteRecord{
@@ -332,9 +333,9 @@ func AuthLogin(c *gin.Context) {
 					}
 
 					if err := invite.Create(model.DB); err != nil {
-						logger.Error(err)
-						RespJson(c, status.InternalServerError, nil)
-						return
+						logger.Error("create UserInvite err:", err)
+						//RespJson(c, status.InternalServerError, nil)
+						//return
 					}
 				}
 				//// 已经邀请过，则更新扫码记录
@@ -806,20 +807,20 @@ func UserCodeToCoupon(c *gin.Context) {
 			return
 		}
 
-		if !user.IsMember() { // 判断用户是否为会员
-			logger.Error("user is not member")
-			RespJson(c, status.UserNotMember, nil)
-			return
-		}
-
-		userMemberLevel = user.MemberLevel
-
-		//if user.OpenMemberTime.IsZero() {
+		//if !user.IsMember() { // 判断用户是否为会员
 		//	logger.Error("user is not member")
 		//	RespJson(c, status.UserNotMember, nil)
 		//	return
 		//}
 
+		userMemberLevel = user.MemberLevel
+
+		if user.OpenMemberTime.IsZero() { // 判断用户是否曾经开过会员
+			logger.Error("user is not member")
+			RespJson(c, status.UserNotMember, nil)
+			return
+		}
+
 		var shopperPromotionCode model.ShopperPromotionCode
 		err := model.NewShopperPromotionCodeQuerySet(model.DB).CodeEq(req.Code).One(&shopperPromotionCode)
 		if err != nil {
diff --git a/controller/user.go b/controller/user.go
index 57badc6..861e033 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -270,7 +270,9 @@ func OpenMember(c *gin.Context) {
 		}
 
 		// 用户已开通会员且优惠券可用
-		if user.IsMember() && coupon.Uid == uc.Uid && coupon.MemberLevel == req.MemberLevel &&
+		//if user.IsMember() && coupon.Uid == uc.Uid && coupon.MemberLevel == req.MemberLevel &&
+		//	coupon.ActivityId == 1 && coupon.State == 1 {
+		if !user.OpenMemberTime.IsZero() && coupon.Uid == uc.Uid && coupon.MemberLevel == req.MemberLevel &&
 			coupon.ActivityId == 1 && coupon.State == 1 {
 			totalFee -= coupon.Value
 
diff --git a/pack/configs/dev/server.json b/pack/configs/dev/server.json
index d52008d..0d0ed66 100644
--- a/pack/configs/dev/server.json
+++ b/pack/configs/dev/server.json
@@ -1,6 +1,6 @@
 {
   "server": {
-    "port": 6001
+    "port": 8001
   },
   "jwt": {
     "user": {