Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_mfyx

controllers/activity.go

@@ -1457,7 +1457,7 @@ func (this *ActivityCoAntroller) AskAdd() {
 		}
 		// 给所属销售发送消息
 		if sellerItem != nil {
-			openIdList, e := models.GetUserRecordListByMobile(4, sellerItem.Mobile+","+utils.WxMsgTemplateIdAskMsgMobilePublic)
+			openIdList, e := models.GetUserRecordListByMobile(12, sellerItem.Mobile+","+utils.WxMsgTemplateIdAskMsgMobilePublic)
 			if e != nil {
 				err = errors.New("GetUserRecordListByMobile, Err: " + e.Error())
 				return

controllers/user.go

@@ -1241,9 +1241,9 @@ func (this *UserController) ApplyTryOut() {
 	if sellerItem == nil {
 		go services.SendPermissionApplyTemplateMsgAdmin(req, mobile, applyMethod, categoryApplyMethod, redirectUrl, isResearch)
 	} else {
-		openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+		openIpItem, _ := models.GetUserRecordByMobile(12, sellerItem.Mobile)
 		if openIpItem != nil && openIpItem.OpenId != "" {
-			go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
+			//go services.SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, mobile, applyMethod, openIpItem)
 			go services.SendPermissionApplyCategoryTemplateMsg(req.RealName, req.CompanyName, mobile, categoryApplyMethod, openIpItem, redirectUrl)
 		}
 	}

models/user_record.go

@@ -99,7 +99,7 @@ func ModifyUserRecordSessionKey(openId, sessionKey string) (err error) {
 // 根据用户id和平台id获取用户关系
 func GetUserRecordByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
 	var sql string
-	sql = `SELECT open_id,cygx_user_id AS user_id  FROM	cygx_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
+	sql = `SELECT open_id,cygx_user_id AS user_id  FROM	cygx_mfyx_gzh_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
 	err = orm.NewOrm().Raw(sql, bindAccount).QueryRow(&item)
 	return
 }
@@ -115,36 +115,16 @@ func GetUserThirdRecordByUserId(userId int) (item *UserRecord, err error) {
 // 根据手机号获取用户的openid
 func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenIdList, err error) {
 	var sql string
-	//if utils.RunMode == "release" {
-	//	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 + `)`
-	//} else {
-	//	platform = 1
-	//	sql = `SELECT open_id,user_id FROM	user_record  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 
+		  cygx_mfyx_gzh_user_record  as cr 
 		WHERE 1= 1	AND cygx_bind_account IN (` + bindAccount + `)`
 	_, err = orm.NewOrm().Raw(sql).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
-//}
-
 func GetOpenIdByUserIds(ids string) (item []*OpenIdList, err error) {
 	o := orm.NewOrm()
 	var sql string
@@ -158,24 +138,6 @@ func GetOpenIdByUserIds(ids string) (item []*OpenIdList, err error) {
 	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(mobiles []string) (items []*OpenIdList, err error) {
 	o := orm.NewOrm()
@@ -191,7 +153,7 @@ func GetUserRecordListByMobileArr(mobiles []string) (items []*OpenIdList, err er
 			u.open_id,
 			u.cygx_user_id AS user_id 
 		FROM
-			cygx_user_record AS u 
+			cygx_mfyx_gzh_user_record AS u 
 		WHERE
 			1 = 1  ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&items)

models/wx_template_msg.go

@@ -34,7 +34,7 @@ func GetWxOpenIdByMobileList(mobile string) (items []*OpenIdList, err error) {
 	sql := ` SELECT
 				union_id,open_id,
 				cygx_user_id AS user_id
-				FROM cygx_user_record	WHERE	1 = 1	AND cygx_bind_account IN (` + mobile + `)`
+				FROM cygx_mfyx_gzh_user_record	WHERE	1 = 1	AND cygx_bind_account IN (` + mobile + `)`
 	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
 	return
 }
@@ -90,7 +90,7 @@ func GetWxOpenIdByMobileSliceList(mobiles []string) (items []*OpenIdList, err er
 			u.open_id,
 			u.cygx_user_id AS user_id 
 		FROM
-			cygx_user_record AS u 
+			cygx_mfyx_gzh_user_record AS u 
 		WHERE
 			1 = 1  ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&items)

services/activity.go

@@ -779,7 +779,7 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 	} else if source == 4 {
 		sourceMsg = "活动报名"
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, sellerItemQy.Mobile)
+	openIdList, e := models.GetUserRecordListByMobile(12, sellerItemQy.Mobile)
 	if e != nil {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error())
 		return err
@@ -788,7 +788,7 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 	var keyword2 string
 	keyword1 = activityDetail.ActivityName
 	keyword2 = fmt.Sprint("互动：", sourceMsg, ",", user.RealName, "--", user.CompanyName)
-	SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
+	//SendWxMsgWithActivityUserRemind(keyword1, keyword2, openIdList, activityDetail.ActivityId)
 
 	// 类目模版
 	keyword1 = utils.TruncateActivityNameString(user.RealName + "-" + user.CompanyName)

services/user.go

@@ -1169,14 +1169,14 @@ func SendPermissionApplyTemplateMsgAdmin(req models.ApplyTryReq, usermobile, app
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue)
+	openIdList, e := models.GetUserRecordListByMobile(12, cnf.ConfigValue)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return err
 	}
 
 	for _, v := range openIdList {
-		go SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, usermobile, applyMethod, v)
+		//go SendPermissionApplyTemplateMsg(req.RealName, req.CompanyName, usermobile, applyMethod, v)
 		go SendPermissionApplyCategoryTemplateMsg(req.RealName, req.CompanyName, usermobile, categoryApplyMethod, v, redirectUrl)
 	}
 

services/wx_category_template_msg.go

@@ -183,7 +183,7 @@ func SendNeiRongZuActivitieSignCategoryTemplateMsg(user *models.WxUserItem, acti
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile+","+utils.MobileShenTao)
+	openIdList, e := models.GetUserRecordListByMobile(12, cnf.ConfigValue+","+sellerItemQy.Mobile+","+utils.MobileShenTao)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return
@@ -237,7 +237,7 @@ func SendActivitieCancelSignCategoryTemplateMsg(user *models.WxUserItem, activit
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile+","+utils.MobileShenTao)
+	openIdList, e := models.GetUserRecordListByMobile(12, cnf.ConfigValue+","+sellerItemQy.Mobile+","+utils.MobileShenTao)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return
@@ -442,7 +442,7 @@ func SendReviewCategoryTemplateMsgAdmin(specialId int) (err error) {
 		}
 	}()
 	//王芳、葛琳和沈涛
-	openIdList, e := models.GetUserRecordListByMobile(4, utils.WxMsgTemplateIdYXSpecialReview)
+	openIdList, e := models.GetUserRecordListByMobile(12, utils.WxMsgTemplateIdYXSpecialReview)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error())
 		return err
@@ -514,7 +514,7 @@ func SendWxCategoryMsgSpecialAuthor(specialId, status int) (err error) {
 		return err
 	}
 
-	openIdList, err := models.GetUserRecordListByMobile(4, user.Mobile)
+	openIdList, err := models.GetUserRecordListByMobile(12, user.Mobile)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return err
 	}
@@ -822,7 +822,7 @@ func SendEmailFileForAskMsgResearch(cont context.Context) (err error) {
 
 			//给所属销售推送消息
 			if sellerItem != nil && user != nil {
-				openIpItem, _ := models.GetUserRecordByMobile(4, sellerItem.Mobile)
+				openIpItem, _ := models.GetUserRecordByMobile(12, sellerItem.Mobile)
 				openIdList := make([]*models.OpenIdList,0)
 				openIdList = append(openIdList, openIpItem)
 				SendWxCategoryMsgWithActivityAsk(user.CompanyName, user.RealName, sellerItem.RealName, time.Now().Format(utils.FormatDateTimeMinute2), v2.Content, openIdList, v2.AskId)