Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_web_mfyx into mfyx_3.0

controllers/home.go

@@ -311,8 +311,8 @@ func (this *MobileHomeController) NewList() {
 		if labelKeyword == "" {
 			//查询近一个月的数据
 			condition += " AND search_order_time  >   '" + time.Now().AddDate(0, 0, -180).Format(utils.FormatDateTime) + "'"
-			yanxuanActivityIds = services.GetYanxuanActivityIds(user) // 获取所有的研选活动ID
-			yanxuanArticleIds = services.GetYanxuanArticleIds()       //获取所有研选文章ID
+			yanxuanActivityIds = services.GetYanxuanActivityIds(user, "1,2") // 获取所有的研选活动ID
+			yanxuanArticleIds = services.GetYanxuanArticleIds()              //获取所有研选文章ID
 		} else {
 			yanxuanActivityIds, yanxuanArticleIds, err = services.GetConditionInitByTagIds(user, labelKeyword)
 			if err != nil {

models/search_key_word.go

@@ -6,15 +6,16 @@ import (
 )
 
 type CygxSearchKeyWord struct {
-	Id          int `orm:"column(id);" description:"id"`
-	KeyWord     string
-	UserId      int
-	CreateTime  time.Time
-	Mobile      string `description:"手机号"`
-	Email       string `description:"邮箱"`
-	CompanyId   int    `description:"公司id"`
-	CompanyName string `description:"公司名称"`
-	RealName    string `description:"用户实际名称"`
+	Id               int `orm:"column(id);" description:"id"`
+	KeyWord          string
+	UserId           int
+	CreateTime       time.Time
+	Mobile           string `description:"手机号"`
+	Email            string `description:"邮箱"`
+	CompanyId        int    `description:"公司id"`
+	CompanyName      string `description:"公司名称"`
+	RealName         string `description:"用户实际名称"`
+	RegisterPlatform int    // 来源 1小程序，2：网页、5：研选小程序
 }
 
 // 新增搜索

services/activity.go

@@ -452,9 +452,10 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 		conditionOr += ` OR (  art.is_limit_people = 1 AND ` + conditionHangYe + condition + ` ) `
 	}
 
-	if userType == 3 {
-		condition += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
-	}
+	//if userType == 3 {
+	//	condition += `  AND art.chart_permission_name  IN (` + permissionNameStrZhengShi + `) `
+	//}
+
 	condition += `    AND  art.is_limit_people = 1  `
 	conditionActivity = condition + permissionSqlStr + sqlExport + conditionOr
 	return
@@ -1899,7 +1900,7 @@ func ActivityVideoUserRmind(user *models.WxUserItem, activityId, fileType int) (
 }
 
 // GetYanxuanActivityIds 获取研选活动ID
-func GetYanxuanActivityIds(user *models.WxUserItem) (activityIds []int) {
+func GetYanxuanActivityIds(user *models.WxUserItem, activeState string) (activityIds []int) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -1910,6 +1911,10 @@ func GetYanxuanActivityIds(user *models.WxUserItem) (activityIds []int) {
 	var condition string
 	var pars []interface{}
 	condition = `  AND  chart_permission_id  = 31  AND yidong_activity_id = '' AND art.publish_status = 1  `
+	if activeState != "" {
+		condition += ` AND  active_state IN  (` + activeState + `)   `
+
+	}
 	//pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 	if user.CompanyId > 1 {
 		conditionActivity, e := ActivityConditioninitSql(user, condition, 0)
@@ -1919,7 +1924,6 @@ func GetYanxuanActivityIds(user *models.WxUserItem) (activityIds []int) {
 		}
 		condition += conditionActivity
 	}
-
 	condition += ` ORDER BY art.activity_time DESC ,  art.active_state ASC   `
 	list, e := models.GetCygxActivityListPage(condition, pars, 0, 2000)
 	if e != nil {

services/es_comprehensive.go

@@ -594,8 +594,8 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 }
 
 func SqlComprehensiveSearch(user *models.WxUserItem, keyWord string, startSize, pageSize int) (result []*SearchComprehensiveItem, total int, err error) {
-	yanxuanActivityIds := GetYanxuanActivityIds(user) // 获取所有的研选活动ID
-	yanxuanArticleIds := GetYanxuanArticleIds()       //获取所有研选文章ID
+	yanxuanActivityIds := GetYanxuanActivityIds(user, "") // 获取所有的研选活动ID
+	yanxuanArticleIds := GetYanxuanArticleIds()           //获取所有研选文章ID
 	yanxuanArticleIds = append(yanxuanArticleIds, 0)
 	yanxuanActivityIds = append(yanxuanActivityIds, 0)
 

services/keyword.go

@@ -30,6 +30,7 @@ func AddSearchKeyWord(user *models.WxUserItem, keyWord string, source int) (err
 	keyWordItem.CompanyId = user.CompanyId
 	keyWordItem.CompanyName = user.CompanyName
 	keyWordItem.RealName = user.RealName
+	keyWordItem.RegisterPlatform = utils.REGISTER_PLATFORM
 	_, err = models.AddSearchKeyWord(keyWordItem)
 	go AddUserSearchLog(user, keyWord, source)
 	go SearchKeywordUserRmind(user, keyWord)

services/tag.go

@@ -52,9 +52,9 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 	var pars []interface{}
 	switch labelKeyword {
 	case utils.LABEL_L1_1: // 全部活动
-		yanxuanActivityIds = GetYanxuanActivityIds(user) // 获取所有的研选活动ID
+		yanxuanActivityIds = GetYanxuanActivityIds(user, "1,2") // 获取所有的研选活动ID
 	case "买方交流": // 买方交流 ->买方线下交流
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 8  `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 8   AND  active_state IN (1,2) `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -65,7 +65,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 			yanxuanActivityIds = append(yanxuanActivityIds, v.ActivityId)
 		}
 	case "专家调研": // 专家调研->专家电话会+专家线下沙龙
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id IN  (1,5) `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id IN  (1,5) AND  active_state IN (1,2)  `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -77,7 +77,7 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 		}
 
 	case "上市公司小范围": // 上市公司小范围->公司调研电话会
-		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 3 `
+		condition = `   AND  chart_permission_id  = ? AND yidong_activity_id = ''  AND activity_type_id = 3  AND  active_state IN (1,2)  `
 		pars = append(pars, utils.CHART_PERMISSION_ID_YANXUAN)
 		list, e := models.GetCygxActivityIdList(condition, pars)
 		if e != nil {
@@ -94,7 +94,8 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 
 	case "纪要": //纪要
 
-		condition = ` AND  article_type_id > 0  AND  article_type_id != 12  `
+		//condition = ` AND  article_type_id > 0  AND  article_type_id != 12  `
+		condition = ` AND  article_type_id > 0  `
 		list, e := models.GetCygxCygxArticleIdList(condition, pars)
 		if e != nil {
 			err = errors.New("GetCygxCygxArticleIdList, Err: " + e.Error())
@@ -104,16 +105,16 @@ func GetConditionInitByTagIds(user *models.WxUserItem, labelKeyword string) (yan
 			yanxuanArticleIds = append(yanxuanArticleIds, v.ArticleId)
 		}
 
-	case "买方沙龙": // 买方沙龙
-		condition = `  AND  article_type_id = 12  `
-		list, e := models.GetCygxCygxArticleIdList(condition, pars)
-		if e != nil {
-			err = errors.New("GetCygxCygxArticleIdList, Err: " + e.Error())
-			return
-		}
-		for _, v := range list {
-			yanxuanArticleIds = append(yanxuanArticleIds, v.ArticleId)
-		}
+		//case "买方沙龙": // 买方沙龙
+		//	condition = `  AND  article_type_id = 12  `
+		//	list, e := models.GetCygxCygxArticleIdList(condition, pars)
+		//	if e != nil {
+		//		err = errors.New("GetCygxCygxArticleIdList, Err: " + e.Error())
+		//		return
+		//	}
+		//	for _, v := range list {
+		//		yanxuanArticleIds = append(yanxuanArticleIds, v.ArticleId)
+		//	}
 	}
 	yanxuanActivityIdsResp = yanxuanActivityIds
 	yanxuanArticleIdsResp = yanxuanArticleIds

services/user_admin_share.go

@@ -72,7 +72,7 @@ func AddCygxUserAdminShareHistory(user *models.WxUserItem, source, sourceTitle,
 	defer func() {
 		if err != nil {
 			fmt.Println(err)
-			go utils.SendAlarmMsg(fmt.Sprint("记录分享来源失败 AddCygxUserAdminShareHistory, err：", err.Error()), 2)
+			go utils.SendAlarmMsg(fmt.Sprint("记录分享来源失败 AddCygxUserAdminShareHistory, err：", err.Error(), "inviteShareCode:", inviteShareCode), 2)
 		}
 	}()
 	adminDetail, e := models.GetUserAdminShareCodeByShareCode(inviteShareCode)
@@ -83,18 +83,6 @@ func AddCygxUserAdminShareHistory(user *models.WxUserItem, source, sourceTitle,
 	if adminDetail == nil {
 		return
 	}
-
-	//内部人员访问不做记录
-
-	//adminUserDetail, e := models.GetSysAdminByMobile(user.Mobile)
-	//if e != nil && e.Error() != utils.ErrNoRow() {
-	//	err = errors.New("GetSysAdminByMobile, Err: " + e.Error())
-	//	return
-	//}
-	//if adminUserDetail != nil {
-	//	return
-	//}
-
 	item := new(models.CygxUserAdminShareHistory)
 	switch source {
 	case utils.CYGX_OBJ_ACTIVITY: