liulei/jx-print
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2022-10-17 15:05:29 +08:00
parent 5f755c01df
commit 68e2c17a2e
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/print_server/app_server/wx_login.go
View File

@@ -30,13 +30,10 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, param *wxLogin.WxLoginReq) (*model
} }
// 检查用户是否存在 // 检查用户是否存在
users, err := dao.GetUsers(globals.GetDB(), "", "", param.Phone, openObj.OpenID) users, err := dao.GetUsers(globals.GetDB(), "", "", param.Phone, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
if len(users) > 1 {
return nil, errors.New("数据异常，用户电话不唯一，联系管理员")
}
var userObj *model.User var userObj *model.User
timeNow := time.Now() timeNow := time.Now()
@@ -74,7 +71,7 @@ func (u *UserLogin) WxLogin(ctx *gin.Context, param *wxLogin.WxLoginReq) (*model
userObj = userBase userObj = userBase
case 1: case 1:
// 用户使用电话号码登录，未使用微信登录 // 用户使用电话号码登录，未使用微信登录
if users[0].OpenId == "" { if users[0].OpenId == "" || users[0].OpenId != openObj.OpenID {
users[0].Name = param.NickName users[0].Name = param.NickName
users[0].Avatar = param.HeadUrl users[0].Avatar = param.HeadUrl
users[0].OpenId = openObj.OpenID users[0].OpenId = openObj.OpenID

7
services/print_server/app_server/wx_print.go
View File

@@ -205,9 +205,10 @@ func TestPrint(appID int, tokenInfo *model.TokenInfo, printNo string, orderNo in
now = time.Now() now = time.Now()
) )
msgID = now.Format("20060102150405") + "_" + putils.RandStringBytesWithNumber(8) msgID = now.Format("20060102150405") + "_" + putils.RandStringBytesWithNumber(8)
if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 { //if apps, _ := dao.GetApps(db, appID, tokenInfo.User.UserID, ""); len(apps) == 0 {
return "", fmt.Errorf("未查询到此应用！app_id:%d", appID) // return "", fmt.Errorf("未查询到此应用！app_id:%d", appID)
} //}
printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0) printers, _ := dao.GetPrinters(db, appID, printNo, 0, 0, 0)
if len(printers) == 0 { if len(printers) == 0 {
return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo) return "", fmt.Errorf("未在该应用下查到此打印机！app_id: %d, print_no: %s", appID, printNo)