From c1943e9b7ec61bf5f345346d0711142ae329c7fd Mon Sep 17 00:00:00 2001 From: denghui <1016848185@qq.com> Date: Thu, 10 Jul 2025 10:12:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=9E=E7=8E=B0=E5=B0=8F=E5=A6=96?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E5=90=8E=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/controller/wx/wx_v1_we_chat_event.go | 6 +- internal/logic/user/user.go | 141 +++++++++++------- internal/model/user.go | 4 +- 3 files changed, 93 insertions(+), 58 deletions(-) diff --git a/internal/controller/wx/wx_v1_we_chat_event.go b/internal/controller/wx/wx_v1_we_chat_event.go index 82616f1..43a98c9 100644 --- a/internal/controller/wx/wx_v1_we_chat_event.go +++ b/internal/controller/wx/wx_v1_we_chat_event.go @@ -29,8 +29,7 @@ func (c *ControllerV1) WeChatEvent(ctx context.Context, req *v1.WeChatEventReq) switch req.Event { case "subscribe": key := strings.TrimPrefix(req.EventKey, "qrscene_") - split := strings.Split(req.EventKey, "_") - out, err := service.User().Login(ctx, &model.UserLoginIn{OpenId: unionid, StoreCode: split[0]}) + out, err := service.User().Login(ctx, &model.UserLoginIn{OpenId: unionid, SceneId: key}) if err != nil { return nil, err } @@ -39,8 +38,7 @@ func (c *ControllerV1) WeChatEvent(ctx context.Context, req *v1.WeChatEventReq) } return nil, nil case "SCAN": - split := strings.Split(req.EventKey, "_") - out, err := service.User().Login(ctx, &model.UserLoginIn{OpenId: unionid, StoreCode: split[0]}) + out, err := service.User().Login(ctx, &model.UserLoginIn{OpenId: unionid, SceneId: req.EventKey}) if err != nil { return nil, err } diff --git a/internal/logic/user/user.go b/internal/logic/user/user.go index 98d8573..c28e820 100644 --- a/internal/logic/user/user.go +++ b/internal/logic/user/user.go @@ -6,6 +6,7 @@ import ( "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/os/glog" "github.com/gogf/gf/v2/os/gtime" + "github.com/gogf/gf/v2/util/gconv" "github.com/gogf/gf/v2/util/grand" "server/internal/consts" "server/internal/dao" @@ -19,6 +20,7 @@ import ( "server/utility/gamelife" "server/utility/jwt" "server/utility/sms" + "strings" ) type sUser struct{} @@ -53,74 +55,109 @@ func New() service.IUser { } func (s *sUser) Login(ctx context.Context, in *model.UserLoginIn) (out *model.UserLoginOut, err error) { + // Fetch role information value, err := dao.Roles.Ctx(ctx).Where(do.Roles{Code: consts.UserRoleCode}).Fields(dao.Roles.Columns().Code, dao.Roles.Columns().Id).One() if err != nil { return nil, ecode.Fail.Sub("查找角色失败") } - // 根据 OpenId 查找用户 - exist, err := dao.Users.Ctx(ctx).Where(do.Users{WxOpenId: in.OpenId}).Exist() - if err != nil { - return nil, ecode.Fail.Sub("查找用户失败") + + split := strings.Split(in.SceneId, "_") + if len(split) < 3 { + return nil, ecode.Fail.Sub("SceneId格式错误") } + storeId := gconv.Int64(split[0]) + var xyUserId string var userId int64 - v, err := dao.Stores.Ctx(ctx).Where(do.Stores{StoreCode: in.StoreCode}).Fields(dao.Stores.Columns().Id).Value() - if err != nil { - return nil, ecode.Fail.Sub("查找门店失败") - } - if !exist { - // 用户不存在，创建新用户 - // 生成 username: qy_ + 8位随机字母数字 - var username string - for { - randomStr := grand.Str("abcdefghijklmnopqrstuvwxyz0123456789", 8) - username = "qy_" + randomStr - // 检查 username 是否唯一 - count, err := dao.Users.Ctx(ctx).Where(do.Users{Username: username}).Count() + + if split[1] == "0" { + // Case 1: split[1] == "0", use in.OpenId to find or create user + exist, err := dao.Users.Ctx(ctx).Where(do.Users{WxOpenId: in.OpenId}).Exist() + if err != nil { + return nil, ecode.Fail.Sub("查找用户失败") + } + + if !exist { + // User does not exist, create new user + var username string + for { + randomStr := grand.Str("abcdefghijklmnopqrstuvwxyz0123456789", 8) + username = "qy_" + randomStr + count, err := dao.Users.Ctx(ctx).Where(do.Users{Username: username}).Count() + if err != nil { + return nil, ecode.Fail.Sub("检查用户名失败") + } + if count == 0 { + break // Username is unique + } + } + password, err := encrypt.EncryptPassword(consts.DefaultPassword) if err != nil { - return nil, ecode.Fail.Sub("检查用户名失败") + return nil, ecode.Fail.Sub("加密密码失败") } - if count == 0 { - break // username 唯一，退出循环 + user := &entity.Users{ + WxOpenId: in.OpenId, + Username: username, + Nickname: username, + PasswordHash: password, + Avatar: consts.DefaultUserAvatar, + FirstVisitAt: gtime.Now(), + LastLoginAt: gtime.Now(), + WxPopenId: utility.GenerateUserID("WX"), + QqPopenId: utility.GenerateUserID("QQ"), + RoleId: value[dao.Roles.Columns().Id].Int64(), + LastLoginStoreId: storeId, + } + result, err := dao.Users.Ctx(ctx).Insert(user) + if err != nil { + return nil, ecode.Fail.Sub("创建用户失败") + } + userId, err = result.LastInsertId() + if err != nil { + return nil, ecode.Fail.Sub("获取用户ID失败") + } + } else { + // User exists, update last login store ID and time + var user entity.Users + if err := dao.Users.Ctx(ctx).Where(do.Users{WxOpenId: in.OpenId}).Scan(&user); err != nil { + return nil, ecode.Fail.Sub("查找用户失败") + } + userId = user.Id + if _, err := dao.Users.Ctx(ctx).Where(do.Users{Id: userId}).Update(do.Users{ + LastLoginAt: gtime.Now(), + LastLoginStoreId: storeId, + }); err != nil { + return nil, ecode.Fail.Sub("更新登录时间失败") } } - password, err := encrypt.EncryptPassword(consts.DefaultPassword) - if err != nil { - return nil, ecode.Fail.Sub("加密密码失败") - } - user := &entity.Users{ - WxOpenId: in.OpenId, - Username: username, - Nickname: username, - PasswordHash: password, - Avatar: consts.DefaultUserAvatar, - FirstVisitAt: gtime.Now(), - LastLoginAt: gtime.Now(), - WxPopenId: utility.GenerateUserID("WX"), - QqPopenId: utility.GenerateUserID("QQ"), - RoleId: value[dao.Roles.Columns().Id].Int64(), - LastLoginStoreId: v.Int64(), - } - result, err := dao.Users.Ctx(ctx).Insert(user) - if err != nil { - return nil, ecode.Fail.Sub("创建用户失败") - } - userId, err = result.LastInsertId() - if err != nil { - return nil, ecode.Fail.Sub("获取用户ID失败") - } - } else { - // 用户存在，更新最后登录时间 + } else if split[1] == "1" { + // Case 2: split[1] == "1", use xyUserId to find user and bind in.OpenId + xyUserId = split[2] var user entity.Users - if err := dao.Users.Ctx(ctx).Where(do.Users{WxOpenId: in.OpenId}).Scan(&user); err != nil { + exist, err := dao.Users.Ctx(ctx).Where(do.Users{XyUserId: xyUserId}).Exist() + if err != nil { + return nil, ecode.Fail.Sub("查找用户失败") + } + if !exist { + return nil, ecode.Fail.Sub("参数错误：用户不存在") + } + + // User exists, bind in.OpenId and update last login store ID + if err := dao.Users.Ctx(ctx).Where(do.Users{XyUserId: xyUserId}).Scan(&user); err != nil { return nil, ecode.Fail.Sub("查找用户失败") } userId = user.Id - if _, err := dao.Users.Ctx(ctx).Where(do.Users{Id: userId}).Update(do.Users{LastLoginAt: gtime.Now(), LastLoginStoreId: v.Int64()}); err != nil { - return nil, ecode.Fail.Sub("更新登录时间失败") + if _, err := dao.Users.Ctx(ctx).Where(do.Users{Id: userId}).Update(do.Users{ + WxOpenId: in.OpenId, + LastLoginAt: gtime.Now(), + LastLoginStoreId: storeId, + }); err != nil { + return nil, ecode.Fail.Sub("绑定OpenId失败") } + } else { + return nil, ecode.Fail.Sub("无效的SceneId类型") } - // 生成 token + // Generate token token, err := jwt.GenerateToken(&jwt.TokenIn{ UserId: userId, Role: value[dao.Roles.Columns().Code].String(), @@ -132,7 +169,7 @@ func (s *sUser) Login(ctx context.Context, in *model.UserLoginIn) (out *model.Us out = &model.UserLoginOut{ Token: token, } - return + return out, nil } func (s *sUser) WeChatLogin(ctx context.Context, in *model.WeChatLogin) (out *model.WeChatLoginOut, err error) { return diff --git a/internal/model/user.go b/internal/model/user.go index 71d95c8..6256c6b 100644 --- a/internal/model/user.go +++ b/internal/model/user.go @@ -59,8 +59,8 @@ type LoginCache struct { } type UserLoginIn struct { - OpenId string - StoreCode string // 门店编码，登录时根据门店编码查询，填写最近一次登录门店 id + OpenId string + SceneId string } type WeChatLogin struct { UUID string // 使用的是微信的唯一 id，而不是openid，保证微信服务号，小程序绑定的系统用户为同一个 From 4b3dcac324ff45f341bfe89ae4c0c027e94f898c Mon Sep 17 00:00:00 2001 From: denghui <1016848185@qq.com> Date: Thu, 10 Jul 2025 10:17:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B0=8F=E5=A6=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=BE=AE=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/logic/user/user.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/logic/user/user.go b/internal/logic/user/user.go index c28e820..29905c0 100644 --- a/internal/logic/user/user.go +++ b/internal/logic/user/user.go @@ -141,11 +141,16 @@ func (s *sUser) Login(ctx context.Context, in *model.UserLoginIn) (out *model.Us return nil, ecode.Fail.Sub("参数错误：用户不存在") } - // User exists, bind in.OpenId and update last login store ID + // User exists, check WxOpenId if err := dao.Users.Ctx(ctx).Where(do.Users{XyUserId: xyUserId}).Scan(&user); err != nil { return nil, ecode.Fail.Sub("查找用户失败") } userId = user.Id + if user.WxOpenId != "" && user.WxOpenId != in.OpenId { + return nil, ecode.Fail.Sub("当前微信已绑定其他微信号") + } + + // Bind in.OpenId and update last login store ID if _, err := dao.Users.Ctx(ctx).Where(do.Users{Id: userId}).Update(do.Users{ WxOpenId: in.OpenId, LastLoginAt: gtime.Now(), From b2df6289238a1323b586f1d1cd37f33cfcb83a0a Mon Sep 17 00:00:00 2001 From: denghui <1016848185@qq.com> Date: Thu, 10 Jul 2025 15:26:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=A2=86=E5=8F=96=E4=BB=BB=E5=8A=A1=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/task/v1/task.go | 2 ++ internal/controller/task/task_v1_get_task.go | 1 + .../task/task_v1_get_user_task_records_list.go | 5 ++++- internal/dao/internal/user_tasks.go | 2 ++ internal/logic/task/task.go | 9 +++++---- internal/model/do/user_tasks.go | 1 + internal/model/entity/user_tasks.go | 1 + internal/model/userTask.go | 2 ++ utility/gamelife/gamelife.go | 2 +- 9 files changed, 19 insertions(+), 6 deletions(-) diff --git a/api/task/v1/task.go b/api/task/v1/task.go index b4bdd19..96c2c7e 100644 --- a/api/task/v1/task.go +++ b/api/task/v1/task.go @@ -87,6 +87,7 @@ type GetTaskReq struct { TaskName string `json:"taskName" v:"required#任务名称不能为空" dc:"任务名称"` TaskType int `json:"taskType" v:"required#任务类型不能为空" dc:"任务类型1：每日 3：周期"` UserTimes int `json:"userTimes" v:"required#完成次数不能为空" dc:"用户完成次数"` + BindType int `json:"bindType" v:"required#不能为空" dc:"绑定类型 1: QQ 2:微信"` } type GetTaskRes struct { @@ -102,6 +103,7 @@ type GetUserTaskRecordsListReq struct { Page int `json:"page" dc:"页数"` Size int `json:"size" dc:"条数"` TimeType int `json:"timeType" dc:"时间类型,1:一周,2:一月,3:一年, 不传就是不加时间限制"` //TODO + BindType int `json:"bindType" v:"required#不能为空" dc:"绑定类型 1: QQ 2:微信"` } type GetUserTaskRecordsListRes struct { List interface{} `json:"list"` diff --git a/internal/controller/task/task_v1_get_task.go b/internal/controller/task/task_v1_get_task.go index 6c74888..bbf5299 100644 --- a/internal/controller/task/task_v1_get_task.go +++ b/internal/controller/task/task_v1_get_task.go @@ -21,6 +21,7 @@ func (c *ControllerV1) GetTask(ctx context.Context, req *v1.GetTaskReq) (res *v1 TaskName: req.TaskName, TaskType: req.TaskType, UserTimes: req.UserTimes, + BindType: req.BindType, }) if err != nil { return nil, err diff --git a/internal/controller/task/task_v1_get_user_task_records_list.go b/internal/controller/task/task_v1_get_user_task_records_list.go index c481a3d..b37ed57 100644 --- a/internal/controller/task/task_v1_get_user_task_records_list.go +++ b/internal/controller/task/task_v1_get_user_task_records_list.go @@ -12,7 +12,10 @@ import ( func (c *ControllerV1) GetUserTaskRecordsList(ctx context.Context, req *v1.GetUserTaskRecordsListReq) (res *v1.GetUserTaskRecordsListRes, err error) { fromCtx := g.RequestFromCtx(ctx) userId := fromCtx.GetCtxVar("id").Int() - out, err := service.Task().GetUserTaskRecordsList(ctx, &model.UserTaskRecordsListIn{UserId: userId, StoreId: req.StoreId, Page: req.Page, Size: req.Size, TimeType: req.TimeType, RewardTypeId: req.RewardTypeId, GameId: req.GameId, NetBarAccount: req.NetbarAccount}) + out, err := service.Task().GetUserTaskRecordsList(ctx, &model.UserTaskRecordsListIn{ + UserId: userId, StoreId: req.StoreId, Page: req.Page, Size: req.Size, TimeType: req.TimeType, + RewardTypeId: req.RewardTypeId, GameId: req.GameId, NetBarAccount: req.NetbarAccount, BindType: req.BindType, + }) if err != nil { return nil, err } diff --git a/internal/dao/internal/user_tasks.go b/internal/dao/internal/user_tasks.go index d3423a5..ee045d0 100644 --- a/internal/dao/internal/user_tasks.go +++ b/internal/dao/internal/user_tasks.go @@ -34,6 +34,7 @@ type UserTasksColumns struct { GameId string // 游戏 id TaskType string // 1: 每日任务 3: 周期任务 UserTimes string // 用户完成次数 + BindType string // 当前账号类型 } // userTasksColumns holds the columns for the table user_tasks. @@ -52,6 +53,7 @@ var userTasksColumns = UserTasksColumns{ GameId: "game_id", TaskType: "task_type", UserTimes: "user_times", + BindType: "bind_type", } // NewUserTasksDao creates and returns a new DAO object for table data access. diff --git a/internal/logic/task/task.go b/internal/logic/task/task.go index 70c7605..252bf54 100644 --- a/internal/logic/task/task.go +++ b/internal/logic/task/task.go @@ -371,10 +371,10 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge start := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) // 当天结束时间 end := time.Date(now.Year(), now.Month(), now.Day(), 23, 59, 59, 0, now.Location()) - err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId}). + err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId, BindType: in.BindType}). WhereBetween(dao.UserTasks.Columns().CreatedAt, start, end).Scan(&userTask) } else { - err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId}).Scan(&userTask) + err = dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: in.TaskId, StoreId: storeId, GameId: in.GameId, BindType: in.BindType}).Scan(&userTask) } if err != nil { @@ -403,6 +403,7 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge GameId: in.GameId, TaskType: in.TaskType, UserTimes: in.UserTimes, + BindType: in.BindType, }) if err != nil { return ecode.Fail.Sub("创建用户任务记录失败") @@ -445,7 +446,7 @@ func (s *sTask) GetTask(ctx context.Context, in *model.GetTaskIn) (out *model.Ge func (s *sTask) GetUserTaskRecordsList(ctx context.Context, in *model.UserTaskRecordsListIn) (out *model.UserTaskRecordsListOut, err error) { list := make([]model.UserTask2, 0) var total int - orm := dao.UserTasks.Ctx(ctx).Where(dao.UserTasks.Columns().UserId, in.UserId) + orm := dao.UserTasks.Ctx(ctx).Where(dao.UserTasks.Columns().UserId, in.UserId, dao.UserTasks.Columns().BindType, in.BindType) if in.StoreId != 0 && in.NetBarAccount == "" { orm = orm.Where(dao.UserTasks.Columns().StoreId, in.StoreId) @@ -503,7 +504,7 @@ func (s *sTask) GetTaskList(ctx context.Context, in *model.GetTaskListV2In) (out if err != nil { return nil, ecode.Fail.Sub("获取任务奖励列表失败") } - orm := dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: v.TaskID}) + orm := dao.UserTasks.Ctx(ctx).Where(do.UserTasks{UserId: in.UserId, TaskId: v.TaskID, BindType: in.BindType}) if v.GameTaskConfig.TimeType == 1 { // 每日任务 start := gtime.Now().StartOfDay() diff --git a/internal/model/do/user_tasks.go b/internal/model/do/user_tasks.go index 95fa16a..e929af4 100644 --- a/internal/model/do/user_tasks.go +++ b/internal/model/do/user_tasks.go @@ -26,4 +26,5 @@ type UserTasks struct { GameId interface{} // 游戏 id TaskType interface{} // 1: 每日任务 3: 周期任务 UserTimes interface{} // 用户完成次数 + BindType interface{} // 当前账号类型 } diff --git a/internal/model/entity/user_tasks.go b/internal/model/entity/user_tasks.go index 6d44095..3511a40 100644 --- a/internal/model/entity/user_tasks.go +++ b/internal/model/entity/user_tasks.go @@ -24,4 +24,5 @@ type UserTasks struct { GameId int64 `json:"gameId" orm:"game_id" description:"游戏 id"` // 游戏 id TaskType int64 `json:"taskType" orm:"task_type" description:"1: 每日任务 3: 周期任务"` // 1: 每日任务 3: 周期任务 UserTimes int64 `json:"userTimes" orm:"user_times" description:"用户完成次数"` // 用户完成次数 + BindType int `json:"bindType" orm:"bind_type" description:"当前账号类型"` // 当前账号类型 } diff --git a/internal/model/userTask.go b/internal/model/userTask.go index f9616df..c8335fe 100644 --- a/internal/model/userTask.go +++ b/internal/model/userTask.go @@ -125,6 +125,7 @@ type GetTaskIn struct { GameId int `json:"gid"` TaskType int `json:"taskType"` UserTimes int `json:"userTimes"` + BindType int `json:"bindType"` } type GetTaskOut struct { @@ -140,6 +141,7 @@ type UserTaskRecordsListIn struct { RewardTypeId int TimeType int GameId int + BindType int } type UserTaskRecordsListOut struct { diff --git a/utility/gamelife/gamelife.go b/utility/gamelife/gamelife.go index cb6a42d..58f7f23 100644 --- a/utility/gamelife/gamelife.go +++ b/utility/gamelife/gamelife.go @@ -170,7 +170,7 @@ func (s *gamelifeClient) GetUserKeyIV(ctx context.Context, popenID string) (*mod Token: result.Key, } cacheKey := fmt.Sprintf(consts.GameLifeUserKey, popenID) - if err := g.Redis().SetEX(ctx, cacheKey, cache, int64(consts.GameLifeUserExpire+grand.Intn(1000))); err != nil { + if err := g.Redis().SetEX(ctx, cacheKey, cache, int64(consts.GameLifeUserExpire-grand.Intn(1000))); err != nil { return nil, ecode.Fail.Sub("设置用户信息失败") }