From 530fed8ec225453572d57b15c200ab062c335457 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 19:20:21 +0800
Subject: [PATCH] 公海member_id使用0
---
service/user.go | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/service/user.go b/service/user.go
index 7edac32..923ccc2 100644
--- a/service/user.go
+++ b/service/user.go
@@ -35,7 +35,7 @@
}
func (userService *UserService) ChangePassword(u *model.User, newPassword string) (userInter *model.User, errCode int) {
- user, err := model.NewUserSearch(nil).SetId(u.ID).First()
+ user, err := model.NewUserSearch(nil).SetId(u.UUID).First()
if err != nil {
return nil, ecode.UserNotExist
}
@@ -45,7 +45,7 @@
}
user.Password = encrypt.BcryptHash(newPassword)
- err = model.NewUserSearch(nil).SetId(u.ID).UpdateByMap(map[string]interface{}{
+ err = model.NewUserSearch(nil).SetId(u.UUID).UpdateByMap(map[string]interface{}{
"password": user.Password})
return user, ecode.OK
@@ -57,9 +57,7 @@
if err != nil {
return err
}
- if user.Ip != "" {
- return errors.New("璇ョ敤鎴峰凡閰嶇疆闆嗙兢锛屾棤娉曞垹闄�")
- }
+
if user.UserType != constvar.UserTypeSub {
return errors.New("璇ョ敤鎴烽潪瀛愯处鎴凤紝鏃犳硶鍒犻櫎")
}
@@ -73,7 +71,7 @@
}
func (userService *UserService) SetUserInfo(req model.User) error {
- return model.NewUserSearch(nil).SetId(req.ID).UpdateByMap(map[string]interface{}{
+ return model.NewUserSearch(nil).SetId(req.UUID).UpdateByMap(map[string]interface{}{
"nick_name": req.NickName,
"header_img": req.HeaderImg,
"phone": req.Phone,
@@ -91,3 +89,21 @@
"password": encrypt.BcryptHash("123456"),
})
}
+
+func (userService *UserService) GetUserList(userIds []int) (userList []*model.User, err error) {
+ return model.NewUserSearch(nil).SetUserIds(userIds).FindAll()
+}
+
+func (userService *UserService) UUID2CrmUserId(uuids []string) (crmUserIds []int, m map[string]int, err error) {
+ idPairs, err := model.NewUserSearch(nil).UUID2CrmUserId(uuids)
+ if err != nil {
+ return
+ }
+ crmUserIds = make([]int, 0, len(idPairs))
+ m = make(map[string]int, len(idPairs))
+ for _, idPair := range idPairs {
+ crmUserIds = append(crmUserIds, idPair.ID)
+ m[idPair.UUID] = idPair.ID
+ }
+ return
+}
--
Gitblit v1.8.0