no message

controllers/activity.go

@@ -655,6 +655,7 @@ func (this *ActivityController) SignupAdd() {
 	}
 	if havePower {
 		item := new(models.CygxActivitySignup)
+		item.RegisterPlatform = utils.REGISTER_PLATFORM
 		resp.HasPermission = 1
 		hasPermission = 1
 		signupStatus = "Success"
@@ -1059,6 +1060,7 @@ func (this *ActivityController) MeetingReminderAdd() {
 	}
 	if havePower {
 		item := new(models.CygxActivityMeetingReminder)
+		item.RegisterPlatform = utils.REGISTER_PLATFORM
 		resp.HasPermission = 1
 		hasPermission = 1
 		signupStatus = "Success"
@@ -1250,6 +1252,7 @@ func (this *ActivityController) ActivityAppointmentAdd() {
 	}
 	if havePower {
 		item := new(models.CygxActivityAppointment)
+		item.RegisterPlatform = utils.REGISTER_PLATFORM
 		resp.HasPermission = 1
 		totalMeeting, errMeeting := models.GetUserCygxActivityAppointmentCount(uid, activityId)
 		if errMeeting != nil {
@@ -1465,6 +1468,7 @@ func (this *ActivityController) AskAdd() {
 		resp.SignupStatus = "Success"
 		resp.HasPermission = 1
 		item := new(models.CygxActivityHelpAsk)
+		item.RegisterPlatform = utils.REGISTER_PLATFORM
 		item.UserId = user.UserId
 		item.ActivityId = req.ActivityId
 		item.CompanyId = user.CompanyId

controllers/activity_special.go

@@ -253,6 +253,7 @@ func (this *ActivitySpecialController) SpecialTripAdd() {
 					return
 				}
 				item := new(models.CygxActivitySpecialTrip)
+				item.RegisterPlatform = utils.REGISTER_PLATFORM
 				item.UserId = uid
 				item.RealName = user.RealName
 				item.ActivityId = activityId
@@ -425,6 +426,7 @@ func (this *ActivitySpecialController) SpecialSignupAdd() {
 				return
 			}
 			item := new(models.CygxActivitySpecialSignup)
+			item.RegisterPlatform = utils.REGISTER_PLATFORM
 			item.UserId = uid
 			item.RealName = user.RealName
 			item.ActivityId = activityId

models/activity_appointment.go

@@ -7,16 +7,17 @@ import (
 )
 
 type CygxActivityAppointment struct {
-	Id          int       `orm:"column(id);pk"`
-	ActivityId  int       `description:"活动ID"`
-	UserId      int       `description:"用户ID"`
-	CreateTime  time.Time `description:"创建时间"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
+	Id               int       `orm:"column(id);pk"`
+	ActivityId       int       `description:"活动ID"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
 type AppointmentResp struct {

models/activity_help_ask.go

@@ -6,15 +6,16 @@ import (
 )
 
 type CygxActivityHelpAsk struct {
-	AskId       int       `orm:"column(ask_id);pk" description:"带问id"`
-	UserId      int       `description:"用户id"`
-	ActivityId  int       `description:"活动id"`
-	CreateTime  time.Time `description:"创建时间"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
-	Content     string    `description:"内容"`
+	AskId            int       `orm:"column(ask_id);pk" description:"带问id"`
+	UserId           int       `description:"用户id"`
+	ActivityId       int       `description:"活动id"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	Content          string    `description:"内容"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
 //添加优化建议

models/activity_meeting_reminder.go

@@ -7,14 +7,15 @@ import (
 )
 
 type CygxActivityMeetingReminder struct {
-	Id          int       `orm:"column(id);pk"`
-	ActivityId  int       `description:"活动ID"`
-	UserId      int       `description:"用户ID"`
-	CreateTime  time.Time `description:"创建时间"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
+	Id               int       `orm:"column(id);pk"`
+	ActivityId       int       `description:"活动ID"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
 //记录日志

models/activity_special_signup.go

@@ -6,16 +6,17 @@ import (
 )
 
 type CygxActivitySpecialSignup struct {
-	Id          int       `orm:"column(id);pk"`
-	ActivityId  int       `description:"活动ID"`
-	UserId      int       `description:"用户ID"`
-	CreateTime  time.Time `description:"创建时间"`
-	Mobile      string    `description:"手机号"`
-	Email       string    `description:"邮箱"`
-	CompanyId   int       `description:"公司id"`
-	CompanyName string    `description:"公司名称"`
-	RealName    string    `description:"用户实际名称"`
-	SellerName  string    `description:"所属销售"`
+	Id               int       `orm:"column(id);pk"`
+	ActivityId       int       `description:"活动ID"`
+	UserId           int       `description:"用户ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱"`
+	CompanyId        int       `description:"公司id"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
 type SignupSpecialStatus struct {

models/activity_special_trip.go

@@ -7,22 +7,23 @@ import (
 )
 
 type CygxActivitySpecialTrip struct {
-	Id             int       `orm:"column(id);pk"`
-	UserId         int       `description:"用户id,多个用,隔开"`
-	ActivityId     int       `description:"活动ID"`
-	CreateTime     time.Time `description:"创建时间"`
-	Mobile         string    `description:"手机号"`
-	Email          string    `description:"邮箱号"`
-	CompanyId      int       `description:"公司ID"`
-	CompanyName    string    `description:"公司名称"`
-	RealName       string    `description:"用户实际名称"`
-	SellerName     string    `description:"所属销售"`
-	AdminId        int       `description:"销售/管理员ID"`
-	Source         int       `description:"来源，1小程序，2后台添加"`
-	OutboundMobile string    `description:"外呼手机号"`
-	CountryCode    string    `description:"手机国家区号"`
-	IsCancel       string    `description:"是否取消，1是，0否"`
-	IsValid        int       `description:"参会报名是否有效 1：是，0"`
+	Id               int       `orm:"column(id);pk"`
+	UserId           int       `description:"用户id,多个用,隔开"`
+	ActivityId       int       `description:"活动ID"`
+	CreateTime       time.Time `description:"创建时间"`
+	Mobile           string    `description:"手机号"`
+	Email            string    `description:"邮箱号"`
+	CompanyId        int       `description:"公司ID"`
+	CompanyName      string    `description:"公司名称"`
+	RealName         string    `description:"用户实际名称"`
+	SellerName       string    `description:"所属销售"`
+	AdminId          int       `description:"销售/管理员ID"`
+	Source           int       `description:"来源，1小程序，2后台添加"`
+	OutboundMobile   string    `description:"外呼手机号"`
+	CountryCode      string    `description:"手机国家区号"`
+	IsCancel         string    `description:"是否取消，1是，0否"`
+	IsValid          int       `description:"参会报名是否有效 1：是，0"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
 }
 
 type CygxActivitySpecialTripResp struct {

services/resource_data.go

@@ -99,6 +99,29 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
 	}
 	var imgUrlResp string
 
+	//处理文章
+	if len(articleIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND a.article_id IN (` + utils.GetOrmInReplace(len(articleIds)) + `)`
+		pars = append(pars, articleIds)
+		articleList, e := models.GetHomeListPublic(condition, pars, 0, len(articleIds))
+		if e != nil {
+			err = errors.New("GetResourceDataList, Err: " + e.Error())
+			return
+		}
+
+		articleList, e = HandleArticleCategoryImg(articleList)
+		if e != nil {
+			err = errors.New("HandleArticleCategoryImg, Err: " + e.Error())
+			return
+		}
+		for _, v := range articleList {
+			mapItems[fmt.Sprint("article", v.ArticleId)].Title = v.Title
+			mapItems[fmt.Sprint("article", v.ArticleId)].Annotation = v.Annotation
+			mapItems[fmt.Sprint("article", v.ArticleId)].Abstract = v.Abstract
+		}
+	}
+
 	//处理活动
 	if len(activityIds) > 0 {
 		for _, vss := range activityIds {

utils/constants.go

@@ -26,6 +26,7 @@ const (
 	ApiUrl              = "https://vmp.hzinsights.com/v2api/"
 	CHART_INFO_HTTP_URL = "https://vmp.hzinsights.com/v2/charts/"
 	DISCLAIMERS         = "本文为用户投稿，用户在平台中发表的所有资料、言论等仅代表个人观点，与本平台立场无关，不对您构成任何投资建议。本平台对文中陈述、观点判断保持中立，不对所包含内容及数据的真实性、准确性、可靠性或完整性提供任何明示或暗示的保证。请读者仅作参考，并请自行承担全部责任。"
+	REGISTER_PLATFORM   = 2 // 来源 1小程序，2：网页
 )
 
 //手机号，电子邮箱正则