no message

controllers/cygx/interview_apply.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hz_crm_api/controllers"
 	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/cygx"
+	cygxService "hongze/hz_crm_api/services/cygx"
 	"hongze/hz_crm_api/utils"
 	"strings"
 )
@@ -45,28 +46,46 @@ func (this *InterviewApplyController) List() {
 	roleTypeCode := sysUser.RoleTypeCode
 	var condition string
 	var pars []interface{}
+	//{
+	//	if roleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
+	//		if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
+	//			condition += ` AND c.product_id=? `
+	//			pars = append(pars, 1)
+	//		} else if roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
+	//			condition += ` AND c.product_id=? `
+	//			pars = append(pars, 2)
+	//		} else {
+	//			if sysUser.Authority <= 0 {
+	//				condition += ` AND c.seller_id=?  `
+	//				pars = append(pars, sysUser.AdminId)
+	//			} else {
+	//				if sysUser.Authority == 1 {
+	//					condition += ` AND c.department_id=? `
+	//					pars = append(pars, sysUser.DepartmentId)
+	//				}
+	//				if sysUser.Authority == 2 {
+	//					condition += ` AND c.group_id=? `
+	//					pars = append(pars, sysUser.GroupId)
+	//				}
+	//			}
+	//		}
+	//	}
+	//}
+
 	{
 		if roleTypeCode != utils.ROLE_TYPE_CODE_ADMIN {
-			if roleTypeCode == utils.ROLE_TYPE_CODE_FICC_ADMIN {
-				condition += ` AND c.product_id=? `
-				pars = append(pars, 1)
-			} else if roleTypeCode == utils.ROLE_TYPE_CODE_RAI_ADMIN {
-				condition += ` AND c.product_id=? `
-				pars = append(pars, 2)
-			} else {
-				if sysUser.Authority <= 0 {
-					condition += ` AND c.seller_id=?  `
-					pars = append(pars, sysUser.AdminId)
-				} else {
-					if sysUser.Authority == 1 {
-						condition += ` AND c.department_id=? `
-						pars = append(pars, sysUser.DepartmentId)
-					}
-					if sysUser.Authority == 2 {
-						condition += ` AND c.group_id=? `
-						pars = append(pars, sysUser.GroupId)
-					}
-				}
+			//权益申请销售只能看到自己名下的客户的申请
+			companyIds, err := cygxService.GetAdminLookUserCompanyIds(sysUser)
+			if err != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取失败，GetAdminLookUserCompanyIds Err:" + err.Error()
+				return
+			}
+
+			lencompanyIds := len(companyIds)
+			if lencompanyIds > 0 {
+				condition += ` AND a.company_id  IN (` + utils.GetOrmInReplace(lencompanyIds) + `)`
+				pars = append(pars, companyIds)
 			}
 		}
 	}
@@ -81,7 +100,25 @@ func (this *InterviewApplyController) List() {
 	startSize = paging.StartIndex(currentIndex, pageSize)
 
 	if keyWord != "" {
-		condition += ` AND (b.mobile LIKE '%` + keyWord + `%' OR b.email LIKE '%` + keyWord + `%' OR b.real_name LIKE '%` + keyWord + `%') `
+		var conditionuiUser string
+		var parsUser []interface{}
+		conditionuiUser += ` AND (mobile LIKE '%` + keyWord + `%' OR email LIKE '%` + keyWord + `%' OR real_name LIKE '%` + keyWord + `%') `
+		listUser, err := models.GetWxUserList(conditionuiUser, parsUser)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "，GetWxUserListErr:" + err.Error()
+			return
+		}
+		var userIds []int
+
+		for _, v := range listUser {
+			userIds = append(userIds, int(v.UserId))
+		}
+		lenuserIds := len(userIds)
+		if lenuserIds > 0 {
+			condition += ` AND a.user_id  IN (` + utils.GetOrmInReplace(lenuserIds) + `)`
+			pars = append(pars, userIds)
+		}
 	}
 
 	total, err := cygx.GetInterviewApplyListCount(condition, pars)

models/cygx/activity_special.go

@@ -461,7 +461,7 @@ func GetAdminMobileByCompany(condition string, pars []interface{}) (list []*Admi
 }
 
 // 获取预约活动的用户的openID
-func GetActivitySpecialOpenIdList() (items []*AdminOpenIdList, err error) {
+func GeFollowSpecialOpenIdList() (items []*AdminOpenIdList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT DISTINCT u.open_id,u.cygx_user_id as  user_id ,m.company_id
 			FROM

models/cygx/cygx_user_record.go

@@ -169,7 +169,7 @@ func GetCygxUserRefusetOpenid() (items []*OpenIdList, err error) {
 
 // 获取选择策略推送的用户的openid openid
 func GetCygxUserFllowCeLueOpenid(categoryId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			cr.open_id,
 			cr.cygx_user_id AS user_id 
@@ -189,7 +189,7 @@ func GetCygxUserFllowCeLueOpenid(categoryId int) (items []*OpenIdList, err error
 
 // 获取关注这个活动对应产业的用户的 openid
 func GetCygxActiviyUserFllowOpenid(activityId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 				cr.open_id,
 				cr.cygx_user_id AS user_id  
@@ -200,7 +200,7 @@ func GetCygxActiviyUserFllowOpenid(activityId int) (items []*OpenIdList, err err
 			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.activity_id = ?  AND mg.source = 1 `
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
 }
@@ -386,3 +386,59 @@ func GetUserRecordListByMobileArr(bindAccount []string) (items []*OpenIdList, er
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
+
+// 获取单个用户openid
+func GetUserRecordOpenidByMobile(bindAccount string) (item *OpenIdList, err error) {
+	o := orm.NewOrm()
+	var sql string
+	sql = `SELECT cr.open_id,u.cygx_user_id as  user_id
+			FROM cygx_user_record AS cr 
+			WHERE cr.cygx_bind_account = ?`
+	err = o.Raw(sql, bindAccount).QueryRow(&item)
+	return
+}
+
+// 获取预约活动的用户的openID
+func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
+	sql := `SELECT DISTINCT cr.open_id,u.cygx_user_id as  user_id
+			FROM
+			cygx_my_schedule AS m
+			INNER JOIN cygx_user_record AS cr ON cr.cygx_bind_account = m.mobile 
+			WHERE m.activity_id = ?  `
+	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
+	return
+}
+
+// 获取预约活动的用户的openID
+func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
+	sql := `SELECT DISTINCT cr.open_id,u.cygx_user_id as  user_id
+			FROM
+			cygx_user_follow_special AS m
+			INNER JOIN cygx_user_record AS cr ON cr.cygx_bind_account = m.mobile  `
+	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+	return
+}
+
+// 获取关注作者的用户的openID
+func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err error) {
+	sql := `SELECT  DISTINCT cr.open_id,u.cygx_user_id as  user_id
+			FROM
+				cygx_article_department_follow AS f
+				INNER JOIN cygx_user_record AS cr  ON cr.cygx_bind_account = f.mobile   
+			WHERE
+				f.department_id = ? `
+	_, err = orm.NewOrm().Raw(sql, departmentId).QueryRows(&items)
+	return
+}
+
+// 获取关注产业的用户的openID
+func GetFollowindustrialOpenIdList(industrialManagementId int) (items []*OpenIdList, err error) {
+	sql := `SELECT DISTINCT cr.open_id,u.cygx_user_id as  user_id
+			FROM
+			cygx_industry_fllow AS f
+			INNER JOIN cygx_user_record AS cr  ON cr.cygx_bind_account = f.mobile   
+			WHERE
+			f.industrial_management_id = ? `
+	_, err = orm.NewOrm().Raw(sql, industrialManagementId).QueryRows(&items)
+	return
+}

models/wechat_send_msg.go

@@ -42,109 +42,109 @@ func GetOpenIdListByMobile(mobile string) (items []*OpenIdList, err error) {
 	return
 }
 
-// 获取预约活动的用户的openID
-func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
-	sql := `SELECT DISTINCT cr.open_id,u.user_id
-			FROM
-			cygx_my_schedule AS m
-			INNER JOIN user_record AS u ON u.bind_account = m.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE m.activity_id = ? AND u.create_platform = 4 `
-	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
-	return
-}
+//// 获取预约活动的用户的openID
+//func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
+//	sql := `SELECT DISTINCT cr.open_id,u.user_id
+//			FROM
+//			cygx_my_schedule AS m
+//			INNER JOIN user_record AS u ON u.bind_account = m.mobile
+//			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id
+//			WHERE m.activity_id = ? AND u.create_platform = 4 `
+//	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
+//	return
+//}
 
 // 获取预约活动的用户的openID测试环境
-func GetActivityOpenIdListByDeBug(activityId int) (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_my_schedule AS s
-			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-		WHERE
-			s.activity_id = ? 
-			AND u.create_platform = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
-	return
-}
+//func GetActivityOpenIdListByDeBug(activityId int) (items []*OpenIdList, err error) {
+//	sql := `SELECT
+//			u.open_id,
+//			u.user_id
+//		FROM
+//			cygx_my_schedule AS s
+//			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
+//			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
+//			INNER JOIN company_product AS p ON p.company_id = wx.company_id
+//		WHERE
+//			s.activity_id = ?
+//			AND u.create_platform = 1
+//			AND p.STATUS IN ( '正式', '试用', '永续' )
+//		GROUP BY
+//			u.open_id`
+//	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
+//	return
+//}
 
-// 获取预约活动的用户的openID
-func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
-	sql := `SELECT DISTINCT cr.open_id,u.user_id
-			FROM
-			cygx_user_follow_special AS m
-			INNER JOIN user_record AS u ON u.bind_account = m.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE  u.create_platform = 4 `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-	return
-}
+//// 获取预约活动的用户的openID
+//func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
+//	sql := `SELECT DISTINCT cr.open_id,u.user_id
+//			FROM
+//			cygx_user_follow_special AS m
+//			INNER JOIN user_record AS u ON u.bind_account = m.mobile
+//			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id
+//			WHERE  u.create_platform = 4 `
+//	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+//	return
+//}
 
 // 获取预约活动的用户的openID测试环境
-func GetActivitySpecialOpenIdListByDeBug() (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_user_follow_special AS s
-			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-		WHERE
-			u.create_platform = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-	return
-}
+//func GetActivitySpecialOpenIdListByDeBug() (items []*OpenIdList, err error) {
+//	sql := `SELECT
+//			u.open_id,
+//			u.user_id
+//		FROM
+//			cygx_user_follow_special AS s
+//			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
+//			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
+//			INNER JOIN company_product AS p ON p.company_id = wx.company_id
+//		WHERE
+//			u.create_platform = 1
+//			AND p.STATUS IN ( '正式', '试用', '永续' )
+//		GROUP BY
+//			u.open_id`
+//	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+//	return
+//}
 
 // 获取关注作者的用户的openID
-func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err error) {
-	sql := `SELECT cr.open_id,u.user_id
-			FROM
-				cygx_article_department_follow AS f
-				INNER JOIN user_record AS u ON u.bind_account = f.mobile
-				INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
-				INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-				INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE
-				f.department_id = ?
-				AND u.create_platform = 4 
-				AND f.type = 1 
-				AND p.status IN ('正式','试用','永续')
-			GROUP BY
-				cr.open_id `
-	_, err = orm.NewOrm().Raw(sql, departmentId).QueryRows(&items)
-	return
-}
+//func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err error) {
+//	sql := `SELECT cr.open_id,u.user_id
+//			FROM
+//				cygx_article_department_follow AS f
+//				INNER JOIN user_record AS u ON u.bind_account = f.mobile
+//				INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
+//				INNER JOIN company_product AS p ON p.company_id = wx.company_id
+//				INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id
+//			WHERE
+//				f.department_id = ?
+//				AND u.create_platform = 4
+//				AND f.type = 1
+//				AND p.status IN ('正式','试用','永续')
+//			GROUP BY
+//				cr.open_id `
+//	_, err = orm.NewOrm().Raw(sql, departmentId).QueryRows(&items)
+//	return
+//}
 
 // 获取关注作者的用户的openID测试环境
-func GetFollowDepartmentOpenIdListByDeBug(departmentId int) (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_article_department_follow AS f
-			INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id
-		WHERE
-			f.department_id = ? 
-			AND u.create_platform = 1
-			AND f.type = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql, departmentId).QueryRows(&items)
-	return
-}
+//func GetFollowDepartmentOpenIdListByDeBug(departmentId int) (items []*OpenIdList, err error) {
+//	sql := `SELECT
+//			u.open_id,
+//			u.user_id
+//		FROM
+//			cygx_article_department_follow AS f
+//			INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
+//			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
+//			INNER JOIN company_product AS p ON p.company_id = wx.company_id
+//		WHERE
+//			f.department_id = ?
+//			AND u.create_platform = 1
+//			AND f.type = 1
+//			AND p.STATUS IN ( '正式', '试用', '永续' )
+//		GROUP BY
+//			u.open_id`
+//	_, err = orm.NewOrm().Raw(sql, departmentId).QueryRows(&items)
+//	return
+//}
 
 // 获取关注产业的用户的openID
 func GetFollowindustrialOpenIdList(industrialManagementId int) (items []*OpenIdList, err error) {
@@ -163,24 +163,24 @@ func GetFollowindustrialOpenIdList(industrialManagementId int) (items []*OpenIdL
 }
 
 // 获取关注产业的用户的openID 测试环境
-func GetFollowindustrialOpenIdListByDeBug(industrialManagementId int) (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_industry_fllow AS f
-			INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-		WHERE
-			f.industrial_management_id = ? 
-			AND u.create_platform = 1 
-			AND u.bind_account != ""
-			AND f.type = 1 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql, industrialManagementId).QueryRows(&items)
-	return
-}
+//func GetFollowindustrialOpenIdListByDeBug(industrialManagementId int) (items []*OpenIdList, err error) {
+//	sql := `SELECT
+//			u.open_id,
+//			u.user_id
+//		FROM
+//			cygx_industry_fllow AS f
+//			INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
+//			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
+//		WHERE
+//			f.industrial_management_id = ?
+//			AND u.create_platform = 1
+//			AND u.bind_account != ""
+//			AND f.type = 1
+//		GROUP BY
+//			u.open_id`
+//	_, err = orm.NewOrm().Raw(sql, industrialManagementId).QueryRows(&items)
+//	return
+//}
 
 // GetUserOpenidListByUserIds 根据用户id字符串集合来获取他的openid列表集合
 func GetUserOpenidListByUserIds(userIdStr []string) (list []*OpenIdList, err error) {

models/wx_user.go

@@ -556,3 +556,14 @@ func GetWxUserRaiSllerListByUserIds(userIds []int) (list []*WxUserSller, err err
 	_, err = o.Raw(sql, userIds).QueryRows(&list)
 	return
 }
+
+func GetWxUserList(condition string, pars []interface{}) (items []*WxUser, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT *
+			FROM wx_user WHERE 1 = 1 `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

services/company_approval_message.go

@@ -3,13 +3,11 @@ package services
 import (
 	"errors"
 	"fmt"
-	"hongze/hz_crm_api/models"
 	"hongze/hz_crm_api/models/company"
 	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/services/alarm_msg"
 	"hongze/hz_crm_api/utils"
-	"strings"
 	"time"
 )
 
@@ -203,12 +201,12 @@ func AddCompanyApprovalMessageRai(companyId, companyContractId int, applyRealNam
 	if err != nil {
 		return
 	}
-	var mobiles string
+	var mobiles []string
 	for _, v := range adminList {
-		mobiles += "'" + v.Mobile + "'" + ","
+		mobiles = append(mobiles, v.Mobile)
 	}
-	mobiles = strings.TrimRight(mobiles, ",")
-	openIdList, err := models.GetUserRecordListByMobile(4, mobiles)
+
+	openIdList, err := cygx.GetUserRecordListByMobileArr(mobiles)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return err
 	}
@@ -238,14 +236,14 @@ func AddCompanyApprovalMessageWangYang(companyId, companyContractId int, applyRe
 	var keyword1, keyword2, keyword3, keyword4 string
 	keyword1 = companyName + "(" + applyRealName + ")"
 	keyword2 = "买方研选转正"
-	var mobiles string
+	var mobiles []string
 	cnf, e := cygx.GetCygxConfigDetailByCode(utils.TPL_MSG_WANG_YANG)
 	if e != nil {
 		err = errors.New("GetConfigByCode, Err: " + e.Error())
 		return
 	}
-	mobiles = cnf.ConfigValue
-	openIdList, err := models.GetUserRecordListByMobile(4, mobiles)
+	mobiles = append(mobiles, cnf.ConfigValue)
+	openIdList, err := cygx.GetUserRecordListByMobileArr(mobiles)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		return err
 	}

services/cygx/acitvity.go

@@ -827,7 +827,7 @@ func IsShowAppointmentByadminSet(IsCanAppointmentMinutes int) (isShowAppointment
 }
 
 //func init() {
-//	DoActivityOnenIdWxTemplateMsg(2100)
+//	DoActivityOnenIdWxTemplateMsg(2621)
 //}
 
 // 处理活动是否进行模板消息推送
@@ -1158,81 +1158,6 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 				havePowerCompanyid += strconv.Itoa(v) + ","
 			}
 		}
-		//for _, v := range openidPowerList {
-		//	//如果仅本组人可见，那么就对companyID做一下限制
-		//	if activityInfo.VisibleRange == 1 {
-		//		if mapCompanyProduct[v.CompanyId] > 0 {
-		//			if _, ok := mapComapnyId[v.CompanyId]; !ok {
-		//				mapComapnyId[v.CompanyId] = v.CompanyId
-		//				companyIds = append(companyIds, v.CompanyId)
-		//			}
-		//		}
-		//	} else {
-		//		if _, ok := mapComapnyId[v.CompanyId]; !ok {
-		//			mapComapnyId[v.CompanyId] = v.CompanyId
-		//			companyIds = append(companyIds, v.CompanyId)
-		//		}
-		//	}
-		//}
-		//fmt.Println("companyIds", companyIds)
-		////获取客户的状态，正式、试用、冻结。
-		//listCompany, err := cygx.GetCompanyDetailByIdGroupList(companyIds)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	return err
-		//}
-		//for _, v := range listCompany {
-		//	itemCompanyPermissionPower := new(cygx.CompanyPermissionPower)
-		//	itemCompanyPermissionPower.CompanyId = v.CompanyId
-		//	itemCompanyPermissionPower.Status = v.Status
-		//	mapComapnyPower[v.CompanyId] = itemCompanyPermissionPower
-		//}
-		//
-		////获取公司权限非正式，用来区分大套餐客户
-		//listCompanyPermission, err := cygx.GetCompanyPermissionByCompanyIds(companyIds)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	return err
-		//}
-		//for _, v := range listCompanyPermission {
-		//	mapComapnyPower[v.CompanyId].PermissionName = v.PermissionName
-		//}
-		//
-		////获取公司权限 正式，用来区分大套餐客户
-		//listCompanyPermissionZhenShi, err := cygx.GetCompanyPermissionZhenShiByCompanyIds(companyIds)
-		//if err != nil && err.Error() != utils.ErrNoRow() {
-		//	return err
-		//}
-		//for _, v := range listCompanyPermissionZhenShi {
-		//	mapComapnyPower[v.CompanyId].PermissionNameZhengShi = v.PermissionName
-		//}
-		//
-		////处理用户身份 userType
-		//for k, v := range mapComapnyPower {
-		//	v.HavePower = true
-		//	mapComapnyPower[k] = GetUserTypeByPermission(v)
-		//}
-		//for k, v := range mapComapnyPower {
-		//	noPower, _ := GetShareNoPowe(activityInfo, v.PermissionName, v.UserType)
-		//	if noPower {
-		//		mapComapnyPower[k].HavePower = false
-		//	}
-		//}
-		////如果活动选了企业管理规模可见字段，则作以下处理
-		//if activityInfo.Scale != "" {
-		//	listCompanyByScale, err := cygx.GetCygxUserRecordPowerByScale(chartPermissionIds, activityInfo.Scale)
-		//	if err != nil && err.Error() != utils.ErrNoRow() {
-		//		return err
-		//	}
-		//	for _, v := range listCompanyByScale {
-		//		if mapComapnyPower[v.CompanyId] != nil {
-		//			mapComapnyPower[v.CompanyId].HavePower = true
-		//		}
-		//	}
-		//}
-		//for _, v := range mapComapnyPower {
-		//	if v.HavePower == true {
-		//		havePowerCompanyid += strconv.Itoa(v.CompanyId) + ","
-		//	}
-		//}
 		havePowerCompanyid = strings.TrimRight(havePowerCompanyid, ",")
 		if havePowerCompanyid == "" {
 			return err

services/cygx/research_summary.go

@@ -351,7 +351,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 					}
 					if len(mapActivityMobile) > 0 {
 						for k := range mapActivityMobile {
-							openIditem, err := models.GetCompanyDetailByIdGroup(4, k)
+							openIditem, err := cygx.GetUserRecordOpenidByMobile(k)
 							if err != nil && err.Error() != utils.ErrNoRow() {
 								return err
 							}
@@ -392,7 +392,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 			if mapOpenidPower[v.UserId] == "" {
 				continue
 			}
-			openIditem := new(models.OpenIdList)
+			openIditem := new(cygx.OpenIdList)
 			openIditem.UserId = v.UserId
 			openIditem.OpenId = v.OpenId
 			first := "您关注的作者发布了新的报告"
@@ -418,7 +418,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 			if mapOpenidPower[v.UserId] == "" {
 				continue
 			}
-			openIditem := new(models.OpenIdList)
+			openIditem := new(cygx.OpenIdList)
 			openIditem.UserId = v.UserId
 			openIditem.OpenId = v.OpenId
 			//first := "您关注的产业有更新报告"
@@ -442,7 +442,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 			if mapOpenidPushed[k] != "" {
 				continue
 			}
-			openIditem := new(models.OpenIdList)
+			openIditem := new(cygx.OpenIdList)
 			openIditem.UserId = k
 			openIditem.OpenId = v
 			first := "您关注的赛道，有新的报告发布/更新，欢迎查看"
@@ -480,7 +480,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 				if mapOpenidPushed[k] != "" {
 					continue
 				}
-				openIditem := new(models.OpenIdList)
+				openIditem := new(cygx.OpenIdList)
 				openIditem.UserId = k
 				openIditem.OpenId = v
 				first := "您关注的赛道，有新的报告发布/更新，欢迎查看"
@@ -496,7 +496,7 @@ func DoArticleOnenIdWxTemplateMsg(articleId int, source int) (err error) {
 			}
 		} else {
 			for k, v := range mapOpenidPower {
-				openIditem := new(models.OpenIdList)
+				openIditem := new(cygx.OpenIdList)
 				openIditem.UserId = k
 				openIditem.OpenId = v
 				first := "您关注的赛道，有新的报告发布/更新，欢迎查看"

services/cygx/special_wx_msg.go

@@ -286,7 +286,7 @@ func SendWxMsgWithCygxActivitySpecialSubscribeNoInterested(activityId int) (err
 		msg = "GetReportInfo Err:" + err.Error()
 		return
 	}
-	openIdList, err := cygx.GetActivitySpecialOpenIdList()
+	openIdList, err := cygx.GeFollowSpecialOpenIdList()
 	if err != nil {
 		msg = "get openIdList err:" + err.Error()
 		return

services/wechat_send_msg.go

@@ -435,19 +435,11 @@ func SendWxMsgWithCygxActivity(activityId int) (err error) {
 		msg = "GetReportInfo Err:" + err.Error()
 		return
 	}
-	var openIdList []*models.OpenIdList
-	if utils.RunMode == "release" {
-		openIdList, err = models.GetActivityOpenIdList(activityId)
-		if err != nil {
-			msg = "get openIdList err:" + err.Error()
-			return
-		}
-	} else {
-		openIdList, err = models.GetActivityOpenIdListByDeBug(activityId)
-		if err != nil {
-			msg = "get openIdList err:" + err.Error()
-			return
-		}
+	var openIdList []*cygx.OpenIdList
+	openIdList, err = cygx.GetActivityOpenIdList(activityId)
+	if err != nil {
+		msg = "get GetActivityOpenIdList err:" + err.Error()
+		return
 	}
 	mapOpenid := make(map[int]string)
 	for _, v := range openIdList {
@@ -462,7 +454,7 @@ func SendWxMsgWithCygxActivity(activityId int) (err error) {
 	if len(openIdListAppointment) > 0 {
 		for _, v := range openIdListAppointment {
 			if _, ok := mapOpenid[v.UserId]; !ok {
-				item := new(models.OpenIdList)
+				item := new(cygx.OpenIdList)
 				item.UserId = v.UserId
 				item.OpenId = v.OpenId
 				openIdList = append(openIdList, item)
@@ -481,7 +473,7 @@ func SendWxMsgWithCygxActivity(activityId int) (err error) {
 	if len(openIdListActivityHelpAsk) > 0 {
 		for _, v := range openIdListActivityHelpAsk {
 			if _, ok := mapOpenid[v.UserId]; !ok {
-				item := new(models.OpenIdList)
+				item := new(cygx.OpenIdList)
 				item.UserId = v.UserId
 				item.OpenId = v.OpenId
 				openIdList = append(openIdList, item)
@@ -563,20 +555,14 @@ func SendWxMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr, strType
 	//		return
 	//	}
 	//}
-	var openIdList []*models.OpenIdList
-	if utils.RunMode == "release" {
-		openIdList, err = models.GetActivityOpenIdList(activityId)
-		if err != nil {
-			msg = "get openIdList err:" + err.Error()
-			return
-		}
-	} else {
-		openIdList, err = models.GetActivityOpenIdListByDeBug(activityId)
-		if err != nil {
-			msg = "get openIdList err:" + err.Error()
-			return
-		}
+	var openIdList []*cygx.OpenIdList
+
+	openIdList, err = cygx.GetActivityOpenIdList(activityId)
+	if err != nil {
+		msg = "get openIdList err:" + err.Error()
+		return
 	}
+
 	mapOpenid := make(map[int]string)
 	for _, v := range openIdList {
 		mapOpenid[v.UserId] = v.OpenId
@@ -590,7 +576,7 @@ func SendWxMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr, strType
 	if len(openIdListAppointment) > 0 {
 		for _, v := range openIdListAppointment {
 			if _, ok := mapOpenid[v.UserId]; !ok {
-				item := new(models.OpenIdList)
+				item := new(cygx.OpenIdList)
 				item.UserId = v.UserId
 				item.OpenId = v.OpenId
 				openIdList = append(openIdList, item)
@@ -609,7 +595,7 @@ func SendWxMsgWithCygxActivityUpdateTime(activityId int, oldStr, newStr, strType
 	if len(openIdListActivityHelpAsk) > 0 {
 		for _, v := range openIdListActivityHelpAsk {
 			if _, ok := mapOpenid[v.UserId]; !ok {
-				item := new(models.OpenIdList)
+				item := new(cygx.OpenIdList)
 				item.UserId = v.UserId
 				item.OpenId = v.OpenId
 				openIdList = append(openIdList, item)
@@ -711,27 +697,19 @@ func SendArticleWxTemplateMsg(nickName, aticleTiele, publishDate, abstract, indu
 	//		return
 	//	}
 	//}
-	var openIdList []*models.OpenIdList
+	var openIdList []*cygx.OpenIdList
 	//utils.FileLog.Info("mobile:%s", otherSellerMobile)
 	//openIdList, err = models.GetOpenIdListByMobile(otherSellerMobile)
 	var resource string
-	if utils.RunMode == "release" {
-		if msgType == "Department" {
-			openIdList, err = models.GetFollowDepartmentOpenIdList(departmentId)
-			resource = strconv.Itoa(departmentId)
-		} else {
-			openIdList, err = models.GetFollowindustrialOpenIdList(industrialManagementId)
-			resource = strconv.Itoa(industrialManagementId)
-		}
+
+	if msgType == "Department" {
+		openIdList, err = cygx.GetFollowDepartmentOpenIdList(departmentId)
+		resource = strconv.Itoa(departmentId)
 	} else {
-		if msgType == "Department" {
-			openIdList, err = models.GetFollowDepartmentOpenIdListByDeBug(departmentId)
-			resource = strconv.Itoa(departmentId)
-		} else {
-			openIdList, err = models.GetFollowindustrialOpenIdListByDeBug(industrialManagementId)
-			resource = strconv.Itoa(industrialManagementId)
-		}
+		openIdList, err = cygx.GetFollowindustrialOpenIdList(industrialManagementId)
+		resource = strconv.Itoa(industrialManagementId)
 	}
+
 	if err != nil {
 		msg = "get openIdList err:" + err.Error()
 		return
@@ -739,17 +717,8 @@ func SendArticleWxTemplateMsg(nickName, aticleTiele, publishDate, abstract, indu
 	if len(openIdList) == 0 {
 		return err
 	}
-	utils.FileLog.Info("openIdListCount:%s", len(openIdList))
-	//redirectUrl := ""
 
 	if len(openIdList) > 0 && utils.TemplateIdByProduct != "" {
-		utils.FileLog.Info("start send")
-		//sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
-		fmt.Println("send start")
-		utils.FileLog.Info("send start")
-		//sendMap := make(map[string]interface{})
-		//sendData := make(map[string]interface{})
-
 		var first string
 		var keyword1 string
 		var keyword2 string
@@ -768,23 +737,10 @@ func SendArticleWxTemplateMsg(nickName, aticleTiele, publishDate, abstract, indu
 		keyword3 := publishDate
 		keyword4 := abstract
 		remark := ""
-		//sendData["first"] = map[string]interface{}{"value": first, "color": "#173177"}
-		//sendData["keyword1"] = map[string]interface{}{"value": keyword1, "color": "#173177"}
-		//sendData["keyword2"] = map[string]interface{}{"value": keyword2, "color": "#173177"}
-		//sendData["keyword3"] = map[string]interface{}{"value": keyword3, "color": "#173177"}
-		//sendData["keyword4"] = map[string]interface{}{"value": keyword4, "color": "#173177"}
-		//sendData["remark"] = map[string]interface{}{"value": remark, "color": "#173177"}
-		//sendMap["template_id"] = utils.TemplateIdByProductXzs
-		//sendMap["url"] = redirectUrl //跳转地址
-		//sendMap["miniprogram"] = map[string]interface{}{"appid": utils.WxCygxAppId, "pagepath": "pageMy/reportDetail/reportDetail?id=" + strconv.Itoa(articleId)}
-		//sendMap["data"] = sendData
-		//sendTemplateMsg(sendUrl, sendMap, openIdList, resource, utils.TEMPLATE_MSG_CYGX_ARTICLE)
-
 		openIdArr := make([]string, len(openIdList))
 		for i, v := range openIdList {
 			openIdArr[i] = v.OpenId
 		}
-
 		sendInfo := new(SendWxTemplate)
 		sendInfo.First = first
 		sendInfo.Keyword1 = keyword1
@@ -798,11 +754,9 @@ func SendArticleWxTemplateMsg(nickName, aticleTiele, publishDate, abstract, indu
 		sendInfo.Resource = resource
 		sendInfo.SendType = utils.TEMPLATE_MSG_CYGX_ARTICLE
 		sendInfo.OpenIdArr = openIdArr
-
 		err = SendTemplateMsg(sendInfo)
 
 	}
-	utils.FileLog.Info("send end")
 	return
 }
 
@@ -1322,8 +1276,8 @@ func SendWxMsgWithCygxActivitySpecial(activityId int) (err error) {
 		return
 	}
 
-	var openIdList []*models.OpenIdList
-	openIdList, err = models.GetActivitySpecialOpenIdList()
+	var openIdList []*cygx.OpenIdList
+	openIdList, err = cygx.GetActivitySpecialOpenIdList()
 	if err != nil {
 		msg = "get openIdList err:" + err.Error()
 		return
@@ -1901,7 +1855,7 @@ func SendWxMsgThisWeekLastWeek(first, keyword1, keyword2, keyword3, keyword4 str
 }
 
 // 推送预约研选的纪要活动、策略报告、研选报告
-func SendWxMsgWithCygxActivityAppointmentNew(first, keyword1, keyword2, keyword3, keyword4 string, item *models.OpenIdList, articleId int) (err error) {
+func SendWxMsgWithCygxActivityAppointmentNew(first, keyword1, keyword2, keyword3, keyword4 string, item *cygx.OpenIdList, articleId int) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
@@ -1923,7 +1877,7 @@ func SendWxMsgWithCygxActivityAppointmentNew(first, keyword1, keyword2, keyword3
 	//	msg = "accessToken is empty"
 	//	return
 	//}
-	var openIdList []*models.OpenIdList
+	var openIdList []*cygx.OpenIdList
 	openIdList = append(openIdList, item)
 	//sendUrl := "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + accessToken
 	//sendMap := make(map[string]interface{})
@@ -2343,7 +2297,7 @@ func SendYbCommunityVideoWxMsgV2(videoId, varietyTagId int, varietyTagName, titl
 }
 
 // SendWxMsgWithRaiSell 权益销售客户申请转正后，消息群发给所有销售
-func SendWxMsgWithRaiSell(first, keyword1, keyword2, keyword3, keyword4 string, openIdList []*models.OpenIdList) (err error) {
+func SendWxMsgWithRaiSell(first, keyword1, keyword2, keyword3, keyword4 string, openIdList []*cygx.OpenIdList) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {
@@ -2376,7 +2330,7 @@ func SendWxMsgWithRaiSell(first, keyword1, keyword2, keyword3, keyword4 string,
 }
 
 // SendWxMsgWithRaiWangYang 客户研选行业转正时(王芳审批通过)，模板消息提醒汪洋
-func SendWxMsgWithRaiWangYang(keyword1, keyword2, keyword3, keyword4 string, openIdList []*models.OpenIdList) (err error) {
+func SendWxMsgWithRaiWangYang(keyword1, keyword2, keyword3, keyword4 string, openIdList []*cygx.OpenIdList) (err error) {
 	var msg string
 	defer func() {
 		if err != nil {