no message

models/activity.go

@@ -616,3 +616,14 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 	_, err = o.Raw(sql, pars, parsSpecil, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+// 列表
+func GetActivityListByCondition(condition string, pars []interface{}) (items []*CygxActivity, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM cygx_activity WHERE  1 =1 `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

services/activity.go

@@ -497,6 +497,7 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		return
 	}
 
+	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
 	mapkeyWord := make(map[string]string)
 	for _, v := range listActivity {
 		if v.Label == "" {
@@ -516,9 +517,9 @@ func HandleActivityTypeHomeList(listType []*models.ActivityTypeHome, listActivit
 		if v.IsExternalLabel > 0 {
 			item.IsExternalLabel = true
 		}
-		if v.IsResearchPoints > 0 {
-			item.IsResearchPoints = true
-		}
+		//if v.IsResearchPoints > 0 {
+		item.IsResearchPoints = activityPointsByUserAllMap[v.ActivityId]
+		//}
 
 		item.City = v.City
 		if utf8.RuneCountInString(v.City) != 2 {
@@ -596,6 +597,9 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 	//IsShowMeetingReminder   bool                       `description:"是否展示会议提醒"`
 	//IsShowHelpSsk           bool                       `description:"是否展示帮我带问"`
 	//IsShowSignup            bool                       `description:"是否展示我要报名"`
+
+	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
+
 	if strings.Contains(articleDetail.ChartPermissionName, utils.CHART_PERMISSION_NAME_YANXUAN) {
 		articleDetail.IsResearch = true
 	}
@@ -699,6 +703,7 @@ func ActivityButtonShow(item *models.ActivityDetail, user *models.WxUserItem, pe
 			}
 		}
 	}
+	articleDetail.IsResearchPoints = activityPointsByUserAllMap[articleDetail.ActivityId]
 	authInfo, permissionArr, e := GetUserRaiPermissionInfo(user.UserId, user.CompanyId)
 	if e != nil {
 		e = errors.New("获取用户权限失败, Err: " + e.Error())

services/activity_button.go

@@ -303,6 +303,9 @@ func ActivityButtonShowSearch(item *models.ActivityDetail, user *models.WxUserIt
 	//if articleDetail.IsHideAppointment == 0 {
 	//	articleDetail.IsShowAppointment = IsShowAppointmentByactivityInfo(articleDetail, articleDetail.ChartPermissionName)
 	//}
+
+	activityPointsByUserAllMap := GetActivityPointsByUserAllMap() // 获取对用户进行研选扣点的活动
+	articleDetail.IsResearchPoints = activityPointsByUserAllMap[articleDetail.ActivityId]
 	if articleDetail.SiginupDeadline == utils.FormatDateTimeInit { //报名截止时间处理
 		articleDetail.SiginupDeadline = ""
 	}

services/activity_points.go

@@ -1,16 +1,58 @@
 package services
 
 import (
+	"errors"
 	"fmt"
 	"hongze/hongze_clpt/models"
 	"hongze/hongze_clpt/utils"
+	"strconv"
 	"time"
 )
 
 //func init() {
-//	GetActivityPointsAll()
+//	GetActivityPointsByUserAllMap()
 //}
 
+// GetActivityPointsByUserAllMap 获取所有针对用户扣点的活动
+func GetActivityPointsByUserAllMap() (mapResp map[int]bool) {
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("GetActivityPointsByUserAllMap，Err："+err.Error(), 2)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+	//获取所有研选类型的活动
+	condition = `  AND chart_permission_id =   ` + strconv.Itoa(utils.CHART_PERMISSION_ID_YANXUAN)
+	listActivity, e := models.GetActivityListByCondition(condition, pars)
+	if e != nil {
+		err = errors.New("GetActivityListByCondition, Err: " + e.Error())
+		return
+	}
+	var activityIds []int
+	condition = ""
+	pars = make([]interface{}, 0)
+	for _, v := range listActivity {
+		activityIds = append(activityIds, v.ActivityId)
+	}
+	condition += ` AND  points_object  IN  (1,3) `
+	condition += ` AND activity_id IN (` + utils.GetOrmInReplace(len(activityIds)) + `)   `
+	pars = append(pars, activityIds)
+	list, e := models.GetCygxActivityPointsSetList(condition, pars, 0, 0)
+	if e != nil {
+		err = errors.New("GetCygxActivityPointsSetList, Err: " + e.Error())
+		return
+	}
+	mapResp = make(map[int]bool, 0)
+	for _, v := range list {
+		mapResp[v.ActivityId] = true
+	}
+	fmt.Println(mapResp)
+	return
+}
+
 // 用户报名添加到处理研选扣点
 func YanXuanActivityPointsBillSignupAdd(activityId, uid int) (err error) {
 	defer func() {