改了一半

models/company/company_product.go

@@ -496,7 +496,7 @@ func GetCompanyProductByCompanyIdAndSellerId(companyId, sellerId int) (item *Com
 
 // GetCompanyProductsByCompanyIds 根据客户id集合字符串获取所有客户产品列表
 func GetCompanyProductsBySellerId(sellerId string) (items []*CompanyProduct, err error) {
-	sql := `SELECT * FROM company_product WHERE seller_id in (` + sellerId + `) `
+	sql := `SELECT * FROM company_product WHERE (seller_id in (` + sellerId + `) OR share_seller_id IN  (` + sellerId + `) )`
 	o := orm.NewOrm()
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

models/cygx/activity_appointment.go

@@ -197,3 +197,21 @@ func GetActivityAppointmentOpenIdList(activityId int) (items []*OpenIdList, err
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
+
+
+// 获取预约活动纪要的的用户的openID
+func GetMfyxActivityAppointmentOpenIdList(activityId int) (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	var sql string
+	sql = `SELECT DISTINCT
+				u.open_id,
+				u.cygx_user_id AS user_id 
+			FROM
+				cygx_activity_appointment AS m
+				INNER JOIN cygx_mfyx_gzh_user_record AS u ON u.cygx_bind_account = m.mobile 
+				AND u.cygx_user_id = m.user_id 
+			WHERE
+				m.activity_id = ? `
+	_, err = o.Raw(sql, activityId).QueryRows(&items)
+	return
+}

models/cygx/activity_help_ask.go

@@ -46,3 +46,20 @@ func GetActivityHelpAskOpenIdList(activityId int) (items []*OpenIdList, err erro
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
+
+// 获取活动带问的用户的openID
+func GetMfyxActivityHelpAskOpenIdList(activityId int) (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	var sql string
+	sql = `SELECT DISTINCT
+				u.open_id,
+				u.cygx_user_id AS user_id 
+			FROM
+				cygx_activity_help_ask AS m
+				INNER JOIN cygx_mfyx_gzh_user_record AS u ON u.cygx_bind_account = m.mobile 
+				AND u.cygx_user_id = m.user_id 
+			WHERE
+				m.activity_id = ? `
+	_, err = o.Raw(sql, activityId).QueryRows(&items)
+	return
+}

models/cygx/cygx_user_record.go

@@ -465,3 +465,49 @@ func GetCygxUserIndustryFllowOpneidByActivityIds(activityId int) (items []*OpenI
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
+
+// 获取预约活动的用户的openID
+func GetMfyxActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT DISTINCT cr.open_id,cr.cygx_user_id as  user_id
+			FROM
+			cygx_my_schedule AS m
+			INNER JOIN cygx_mfyx_gzh_user_record AS cr ON cr.cygx_bind_account = m.mobile 
+			WHERE m.activity_id = ?  `
+	_, err = o.Raw(sql, activityId).QueryRows(&items)
+	return
+}
+
+
+// 根据手机号获取用户的openid
+func GetMfyxUserRecordListByMobileArr(bindAccount []string) (items []*OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	lenarr := len(bindAccount)
+	if lenarr == 0 {
+		return
+	}
+	var condition string
+	var pars []interface{}
+	condition = ` AND u.cygx_bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, bindAccount)
+	sql := `SELECT
+			u.open_id,
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_mfyx_gzh_user_record AS u 
+		WHERE
+			1 = 1  ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}
+
+// 获取单个用户openid
+func GetMfyxUserRecordOpenidByMobile(bindAccount string) (item *OpenIdList, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	var sql string
+	sql = `SELECT cr.open_id,cr.cygx_user_id as  user_id
+			FROM cygx_mfyx_gzh_user_record AS cr 
+			WHERE cr.cygx_bind_account = ?`
+	err = o.Raw(sql, bindAccount).QueryRow(&item)
+	return
+}

services/cygx/research_summary.go

@@ -356,6 +356,10 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 							if err != nil && err.Error() != utils.ErrNoRow() {
 								return err
 							}
+							//mfyxOpenIditem, err := cygx.GetMfyxUserRecordOpenidByMobile(k)
+							if err != nil && err.Error() != utils.ErrNoRow() {
+								return err
+							}
 							//如果没有权限或者没有获取到 openID的就不推送
 							if openIditem == nil || mapOpenidPower[openIditem.UserId] == "" {
 								continue

services/wechat_send_category_template_msg.go

@@ -91,7 +91,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr,
 
 	var openIdList []*cygx.OpenIdList
 
-	openIdList, err = cygx.GetActivityOpenIdList(activityId)
+	openIdList, err = cygx.GetMfyxActivityOpenIdList(activityId)
 	if err != nil {
 		msg = "get openIdList err:" + err.Error()
 		return
@@ -102,7 +102,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr,
 		mapOpenid[v.UserId] = v.OpenId
 	}
 	//添加预约纪要的openid
-	openIdListAppointment, err := cygx.GetActivityAppointmentOpenIdList(activityId)
+	openIdListAppointment, err := cygx.GetMfyxActivityAppointmentOpenIdList(activityId)
 	if err != nil {
 		msg = "GetActivityAppointmentOpenIdList err:" + err.Error()
 		return
@@ -121,7 +121,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr,
 	}
 
 	//添加带问的openid
-	openIdListActivityHelpAsk, err := cygx.GetActivityHelpAskOpenIdList(activityId)
+	openIdListActivityHelpAsk, err := cygx.GetMfyxActivityHelpAskOpenIdList(activityId)
 	if err != nil {
 		msg = "openIdListActivityHelpAsk err:" + err.Error()
 		return
@@ -216,7 +216,7 @@ func SendWxCategoryMsgWithCygxActivity(activityId int) (err error) {
 		return
 	}
 	var openIdList []*cygx.OpenIdList
-	openIdList, err = cygx.GetActivityOpenIdList(activityId)
+	openIdList, err = cygx.GetMfyxActivityOpenIdList(activityId)
 	if err != nil {
 		msg = "get GetActivityOpenIdList err:" + err.Error()
 		return
@@ -245,7 +245,7 @@ func SendWxCategoryMsgWithCygxActivity(activityId int) (err error) {
 	}
 
 	//添加带问的openid
-	openIdListActivityHelpAsk, err := cygx.GetActivityHelpAskOpenIdList(activityId)
+	openIdListActivityHelpAsk, err := cygx.GetMfyxActivityHelpAskOpenIdList(activityId)
 	if err != nil {
 		msg = "openIdListActivityHelpAsk err:" + err.Error()
 		return
@@ -340,7 +340,7 @@ func SendWxCategoryMsgWithCygxActivityUpdateLimitPeople(activityId int) (err err
 	//condition += ` AND u.mobile IN (` + utils.GetOrmInReplace(mobileLen) + `)`
 	//pars = append(pars, mobileArr)
 
-	openIdList, e := cygx.GetUserRecordListByMobileArr(mobileArr)
+	openIdList, e := cygx.GetMfyxUserRecordListByMobileArr(mobileArr)
 	if e != nil {
 		err = errors.New("GetWxOpenIdBList, Err: " + e.Error())
 		return