no message

models/user_record.go

@@ -124,50 +124,77 @@ func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenI
 	//	platform = 1
 	//	sql = `SELECT open_id,user_id FROM	user_record  WHERE create_platform =? AND bind_account IN (` + bindAccount + `)`
 	//}
-	sql = `SELECT cr.open_id,user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE create_platform=? AND bind_account IN (` + bindAccount + `)`
+	sql = `SELECT
+			cr.open_id,
+			cr.cygx_user_id as  user_id 
+		FROM
+		  cygx_user_record  as cr 
+		WHERE 1= 1	AND cygx_bind_account IN (` + bindAccount + `)`
 	_, err = orm.NewOrm().Raw(sql, platform).QueryRows(&items)
 	return
 }
 
-// 获取单个用户openid
-func GetOpenIdDetailByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
-	o := orm.NewOrm()
-	var sql string
-	sql = `SELECT cr.open_id,wu.user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			INNER JOIN wx_user AS wu ON wu.mobile = u.bind_account 
-			WHERE create_platform=? AND u.bind_account = ?`
-	err = o.Raw(sql, platform, bindAccount).QueryRow(&item)
-	return
-}
+//// 获取单个用户openid
+//func GetOpenIdDetailByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
+//	o := orm.NewOrm()
+//	var sql string
+//	sql = `SELECT cr.open_id,wu.user_id FROM user_record  as u
+//			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id
+//			INNER JOIN wx_user AS wu ON wu.mobile = u.bind_account
+//			WHERE create_platform=? AND u.bind_account = ?`
+//	err = o.Raw(sql, platform, bindAccount).QueryRow(&item)
+//	return
+//}
 
 func GetOpenIdByUserIds(ids string) (item []*OpenIdList, err error) {
 	o := orm.NewOrm()
 	var sql string
-	sql = `SELECT cr.open_id,wu.user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			INNER JOIN wx_user AS wu ON wu.mobile = u.bind_account 
-			WHERE create_platform=4 AND u.user_id IN (` + ids + `)`
+	sql = ` SELECT
+			cr.open_id,
+			cr.cygx_user_id as  user_id 
+		FROM
+		  cygx_user_record  as cr 
+		WHERE 1= 1	AND cygx_user_id IN (` + ids + `)`
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
 }
 
+//// 根据手机号获取用户的openid
+//func GetUserRecordListByMobileArr(bindAccount []string) (items []*OpenIdList, err error) {
+//	lenarr := len(bindAccount)
+//	if lenarr == 0 {
+//		return
+//	}
+//	var condition string
+//	var pars []interface{}
+//	condition = ` AND u.bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+//	pars = append(pars, bindAccount)
+//	sql := `SELECT cr.open_id,u.user_id
+//			FROM user_record  as u
+//			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id
+//			WHERE u.create_platform=4 ` + condition
+//	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
+//	return
+//}
+
 // 根据手机号获取用户的openid
-func GetUserRecordListByMobileArr(bindAccount []string) (items []*OpenIdList, err error) {
-	lenarr := len(bindAccount)
+func GetUserRecordListByMobileArr(mobiles []string) (items []*OpenIdList, err error) {
+	o := orm.NewOrm()
+	lenarr := len(mobiles)
 	if lenarr == 0 {
 		return
 	}
 	var condition string
 	var pars []interface{}
-	condition = ` AND u.bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
-	pars = append(pars, bindAccount)
-	sql := `SELECT cr.open_id,u.user_id
-			FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE u.create_platform=4 ` + condition
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
+	condition = ` AND u.cygx_bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, mobiles)
+	sql := `SELECT
+			u.open_id,
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_user_record AS u 
+		WHERE
+			1 = 1  ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/wx_user.go

@@ -285,7 +285,7 @@ func GetUserCountByName(companyId int, name string) (count int, err error) {
 
 // 判断这个用户是否被设置消息提醒
 func GetUserRemind(uid int) (count int, err error) {
-	o := orm.NewOrmUsingDB("weekly_report")
+	o := orm.NewOrm()
 	sql := `SELECT  COUNT(1) AS count FROM cygx_user_remind WHERE user_id = ? `
 	err = o.Raw(sql, uid).QueryRow(&count)
 	return

services/activity_special.go

@@ -1128,8 +1128,9 @@ func SendWxMsgActivitySpecialTwoDays(cont context.Context) (err error) {
 				return
 			}
 			//获取手机号对应的Openid
-			listSellerOpenid, err := models.GetWxOpenIdByMobileSliceList(mobileArr)
-			if err != nil {
+			listSellerOpenid, e := models.GetWxOpenIdByMobileSliceList(mobileArr)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				err = errors.New("GetWxOpenIdByMobileSliceList, Err: " + e.Error())
 				return
 			}
 			mapMobileOpenid := make(map[string]string)
@@ -1270,11 +1271,11 @@ func SendWxMsgActivitySpecialCancel(cont context.Context) (err error) {
 				return
 			}
 			//获取手机号对应的Openid
-			listSellerOpenid, err := models.GetWxOpenIdByMobileSliceList(mobileArr)
-			if err != nil {
+			listSellerOpenid, e := models.GetWxOpenIdByMobileSliceList(mobileArr)
+			if e != nil && e.Error() != utils.ErrNoRow() {
+				err = errors.New("GetWxOpenIdByMobileSliceList, Err: " + e.Error())
 				return
 			}
-
 			if len(listSellerOpenid) > 0 {
 				for _, vOpenid := range listSellerOpenid {
 					openIdArr = append(openIdArr, vOpenid.OpenId)