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": {