Merge branch 'cygx/cygx_14.0' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

models/cygx/cygx_user_record.go

@@ -193,16 +193,17 @@ func GetCygxUserFllowCeLueOpenid(categoryId int) (items []*OpenIdList, err error
 func GetCygxActiviyUserFllowOpenid(activityId int) (items []*OpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-				cr.open_id,
-				cr.cygx_user_id AS user_id  
+			cr.open_id,
+			cr.cygx_user_id AS user_id 
 		FROM
-			cygx_xzs_choose_send AS s
-			INNER JOIN cygx_industry_fllow AS f ON f.user_id = s.user_id
-			INNER JOIN cygx_user_record AS cr  ON cr.cygx_user_id = s.user_id 
+			cygx_user_record AS cr
+			INNER JOIN cygx_industry_fllow AS f ON f.user_id = cr.cygx_user_id
 			INNER JOIN cygx_industrial_activity_group_management AS mg ON mg.industrial_management_id = f.industrial_management_id 
 		WHERE
-			1=1 
-			AND mg.activity_id = ?  AND mg.source = 1 `
+			1 = 1 
+			AND mg.activity_id = ? 
+			AND mg.source = 1 
+			AND f.follow_type = 1 `
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }

services/cygx/acitvity.go

@@ -830,7 +830,7 @@ func IsShowAppointmentByadminSet(IsCanAppointmentMinutes int) (isShowAppointment
 }
 
 //func init() {
-//	DoActivityOnenIdWxTemplateMsg(2703)
+//	DoActivityOnenIdWxTemplateMsg(2986)
 //}
 
 // 处理活动是否进行模板消息推送
@@ -920,24 +920,6 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 	//conditionPer = ` AND p.chart_permission_id IN (` + utils.GetOrmInReplace(len(chartPermissionIdArr)) + `) `
 	parsPer = append(parsPer, chartPermissionIdArr)
 
-	//if len(chartPermissionStarus) > 0 {
-	//	conditionPer += ` AND p.STATUS IN (` + utils.GetOrmInReplace(len(chartPermissionStarus)) + `) `
-	//	parsPer = append(parsPer, chartPermissionStarus)
-	//}
-
-	//先获取有对应权限的所有用户
-	//openidPowerList, e := cygx.GetCygxUserRecordPowerOpenid(conditionPer, parsPer)
-	//if e != nil && e.Error() != utils.ErrNoRow() {
-	//	err = errors.New("GetCygxUserRecordPowerOpenid, Err: " + e.Error())
-	//	return
-	//}
-	//fmt.Println(len(openidPowerList))
-	// 获取所有有权的用户的 openid
-	//openidPowerList, err := cygx.GetCygxUserRecordPower(chartPermissionIds)
-	//if err != nil {
-	//	return
-	//}
-
 	var havePowerCompanyid string
 	//如果活动限制人数就做可见区分判断
 	if activityInfo.IsLimitPeople > 0 {
@@ -1260,6 +1242,7 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 	//获取关注这个活动对应产业的用户的 openid
 	mapOpenidFllow := make(map[int]string)
 	openidFllowList, err := cygx.GetCygxActiviyUserFllowOpenid(activityId)
+
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return err
 	}
@@ -1269,6 +1252,7 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 
 	//fmt.Println(mapOpenidFllow)
 	openidPowerByActivitySetList, openidPowerByActivitySetListYx, err := cygx.GetCygxUserRecordPowerByActivitySet(chartPermissionIds, condition)
+
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return err
 	}
@@ -1281,6 +1265,7 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 	for _, v := range listSendOpendId {
 		mapSendOpenid[v.OpenId] = v.UserId
 	}
+
 	var OpenIdList []*models.OpenIdList
 	for _, v := range openidPowerByActivitySetList {
 		if mapSendOpenid[v.OpenId] > 0 {
@@ -1295,7 +1280,7 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 			OpenIdList = append(OpenIdList, item)
 		} else {
 			//如果勾选了权限信息，则要满足 1选择产业，2没有选择不接受任何消息推送，3活动对应的主客观跟自己选择的一致。
-			if mapOpenidFllow[v.UserId] != "" && mapOpenidRefuset[v.UserId] == "" && mapUserIdChooseTypeSend[v.UserId] != 0 {
+			if mapOpenidRefuset[v.UserId] == "" && mapUserIdChooseTypeSend[v.UserId] != 0 {
 				OpenIdList = append(OpenIdList, item)
 			}
 		}
@@ -1331,7 +1316,7 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 			OpenIdListYx = append(OpenIdListYx, item)
 		} else {
 			//如果勾选了权限信息，则要满足 1选择产业，2没有选择不接受任何消息推送，3活动对应的主客观跟自己选择的一致。
-			if mapOpenidFllow[v.UserId] != "" && mapOpenidRefuset[v.UserId] == "" && mapUserIdChooseTypeSend[v.UserId] != 0 {
+			if mapOpenidRefuset[v.UserId] == "" && mapUserIdChooseTypeSend[v.UserId] != 0 {
 				OpenIdListYx = append(OpenIdListYx, item)
 			}
 		}