xiugai

pushentniche/src/push/job/pushjob.go

@@ -178,18 +178,25 @@ func (p *PushJob) StartPush(pusher Pusher, taskType int) {
 }
 
 func (p *PushJob) AppendGetUserInfo(u *UserInfo) (*UserInfo, *PushWay) {
-	user := mongodb.FindOneByField(User, map[string]interface{}{
+	users := mongodb.Find(User, map[string]interface{}{
 		"i_appid": 2,
-		"s_phone": u.Phone,
-	}, `{"_id":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1}`)
-	if user == nil || len(*user) == 0 {
+		"$or": []map[string]interface{}{
+			map[string]interface{}{
+				"s_phone": u.Phone,
+			},
+			map[string]interface{}{
+				"s_m_phone": u.Phone,
+			},
+		},
+	}, `{"s_phone":-1}`, `{"_id":1,"s_jpushid":1,"s_opushid":1,"s_appponetype":1}`, false, 0, 1)
+	if users == nil || len(*users) == 0 {
 		logger.Error("mongodb中没有找到该用户", u.EntName, u.EntId, u.DeptName, u.DeptId, u.Id, u.Phone)
 		return nil, nil
 	}
-	u.MId = util.BsonIdToSId((*user)["_id"])
-	u.Jpushid = util.ObjToString((*user)["s_jpushid"])
-	u.Opushid = util.ObjToString((*user)["s_opushid"])
-	u.AppPhoneType = util.ObjToString((*user)["s_appponetype"])
+	u.MId = util.BsonIdToSId((*users)[0]["_id"])
+	u.Jpushid = util.ObjToString((*users)[0]["s_jpushid"])
+	u.Opushid = util.ObjToString((*users)[0]["s_opushid"])
+	u.AppPhoneType = util.ObjToString((*users)[0]["s_appponetype"])
 	logger.Info("mongodb中找到该用户", u.EntName, u.EntId, u.DeptName, u.DeptId, u.Id, u.Phone, u.MId, u.Jpushid, u.Opushid, u.AppPhoneType)
 	pushWay := NewPushWay(u)
 	return u, pushWay