合并master分支

controllers/activity.go

@@ -87,9 +87,9 @@ func (this *ActivityCoAntroller) ActivityList() {
 	whichDay := this.GetString("WhichDay")
 	isShowJurisdiction, _ := this.GetInt("IsShowJurisdiction")
 	keyWord := this.GetString("KeyWord")
+	keyWordSearch := this.GetString("KeyWord")
 	activeState := this.GetString("ActiveState")
 	label := this.GetString("Label")
-
 	//入参为 undefined 时的处理
 	if chartPermissionIds == "undefined" {
 		chartPermissionIds = ""
@@ -133,6 +133,7 @@ func (this *ActivityCoAntroller) ActivityList() {
 	if isShowJurisdiction == 1 && chartPermissionIds == "" && userType == 4 {
 		activityTypeIds = "1,3"
 	}
+
 	var startSize int
 	if pageSize <= 0 {
 		pageSize = utils.PageSize20
@@ -265,7 +266,6 @@ func (this *ActivityCoAntroller) ActivityList() {
 	} else {
 		condition += ` ORDER BY art.active_state ASC, art.activity_time ASC  `
 	}
-
 	list, errList := models.GetActivityListAll(condition, pars, uid, startSize, pageSize)
 	if errList != nil {
 		br.Msg = "获取失败"
@@ -334,6 +334,14 @@ func (this *ActivityCoAntroller) ActivityList() {
 		expertTxt, _ := services.GetReportContentTextSub(v.Expert)
 		list[k].Expert = expertTxt
 	}
+	if keyWordSearch != "" {
+		keyWordItem := new(models.CygxUserSearchKeyWord)
+		keyWordItem.UserId = user.UserId
+		keyWordItem.KeyWord = keyWordSearch
+		keyWordItem.PageType = "ActivitSearch"
+		keyWordItem.CreateTime = time.Now()
+		go models.AddUserSearchKeyWord(keyWordItem)
+	}
 	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(models.GetCygxActivityListRep)
 	resp.List = list
@@ -875,6 +883,14 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				br.Data = resp
 				return
 			}
+			var sellerName string
+			sellerName, err = models.GetCompanySellerName(user.CompanyId)
+			if err != nil {
+				br.Msg = "报名失败！"
+				br.ErrMsg = "获取对应销售失败，Err:" + err.Error()
+				return
+			}
+
 			//人数已满：FullStarffed、单机构超过两人：TwoPeople、爽约次数过多：BreakPromise、超时：Overtime 、成功：Success"`
 			//如果是下面几种情况则对报名信息做判断限制 （公司调研电话会（限制人数）、公司线下调研、专家/分析师线下沙龙）
 			if (activityInfo.ActivityTypeId == 3 && activityInfo.IsLimitPeople == 1) || activityInfo.ActivityTypeId > 3 {
@@ -918,6 +934,8 @@ func (this *ActivityCoAntroller) SignupAdd() {
 				//解除报名限制之后二次报名相同活动
 				if totalUserRestrictCount > 0 && totalRestrict == 0 && resp.GoBindEmail != true {
 					item.UserId = uid
+					item.RealName = user.RealName
+					item.SellerName = sellerName
 					item.ActivityId = activityId
 					item.CreateTime = time.Now()
 					item.Mobile = user.Mobile
@@ -962,6 +980,8 @@ func (this *ActivityCoAntroller) SignupAdd() {
 
 				if signupStatus != "Success" && totalMy == 0 && resp.GoBindEmail != true {
 					item.UserId = uid
+					item.RealName = user.RealName
+					item.SellerName = sellerName
 					item.ActivityId = activityId
 					item.CreateTime = time.Now()
 					item.Mobile = user.Mobile
@@ -1006,6 +1026,8 @@ func (this *ActivityCoAntroller) SignupAdd() {
 			}
 			if signupStatus == "Success" && resp.GoBindEmail != true {
 				item.UserId = uid
+				item.RealName = user.RealName
+				item.SellerName = sellerName
 				item.ActivityId = activityId
 				item.CreateTime = time.Now()
 				item.Mobile = user.Mobile

controllers/article.go

@@ -497,6 +497,7 @@ func (this *ArticleCommonController) Detail() {
 			}
 		}
 	}
+	resp.HasPermission = 1
 	detail.Abstract, _ = services.GetReportContentTextSub(detail.Abstract)
 	detail.SellerList = sellerList
 	resp.Detail = detail

models/activity_mirror_word.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"fmt"
 	"rdluck_tools/orm"
 )
 
@@ -23,9 +22,8 @@ func GetActivityMirrorWordList() (items []*ActivityFastsearchKeywords, err error
 	return
 }
 
-//获取我的日程数量
+//获取镜像词数量
 func GetActivityMirrorWordCount(keyWord string) (count int, err error) {
-	fmt.Println(keyWord)
 	o := orm.NewOrm()
 	sqlCount := ` SELECT COUNT( 1 ) AS count  FROM cygx_activity_mirror_word WHERE key_word IN (` + keyWord + `) `
 	err = o.Raw(sqlCount).QueryRow(&count)

models/activity_signup.go

@@ -20,6 +20,8 @@ type CygxActivitySignup struct {
 	DoFailType     int       `description:"失败原因，0，未失败，1总人数已满，2单机构超限制，3，爽约次数超限"`
 	OutboundMobile string    `description:"外呼手机号"`
 	CountryCode    string    `description:"手机国家区号"`
+	RealName       string    `description:"用户实际名称"`
+	SellerName     string    `description:"所属销售"`
 }
 
 type SignupStatus struct {

models/company.go

@@ -131,3 +131,15 @@ func GetSellerDetailAllByCompanyId(companyId int) (item *CompanyDetail, err erro
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
 }
+
+func GetCompanySellerName(companyId int) (sellerName string, err error) {
+	sql := ` SELECT
+			GROUP_CONCAT( DISTINCT p.seller_name SEPARATOR '/' ) AS sellerName 
+		FROM
+			company_product AS p
+		WHERE
+			p.company_id = ? `
+	o := orm.NewOrm()
+	err = o.Raw(sql, companyId).QueryRow(&sellerName)
+	return
+}

models/db.go

@@ -84,5 +84,6 @@ func init() {
 		new(CygxActivityAttendanceDetail),
 		new(CygxActivityRestrictSignup),
 		new(CygxActivityMeetDetailLog),
+		new(CygxUserSearchKeyWord),
 	)
 }

models/user_search_key_word.go

@@ -0,0 +1,21 @@
+package models
+
+import (
+	"rdluck_tools/orm"
+	"time"
+)
+
+type CygxUserSearchKeyWord struct {
+	Id         int    `orm:"column(id);" description:"id"`
+	KeyWord    string `description:"关键词"`
+	PageType   string `description:"页面类型，活动搜索：ActivitSearch"`
+	UserId     int
+	CreateTime time.Time
+}
+
+//新增
+func AddUserSearchKeyWord(item *CygxUserSearchKeyWord) (lastId int64, err error) {
+	o := orm.NewOrm()
+	lastId, err = o.Insert(item)
+	return
+}

services/article.go

@@ -345,6 +345,7 @@ func GetArticleListByApi(cont context.Context) (err error) {
 	var listAuthor []*models.CygxArticleAuthor
 	for _, v := range listData {
 		if exitMap[v.SeriesId] > 0 {
+			v.PublishDate = time.Date(v.PublishDate.Year(), v.PublishDate.Month(), v.PublishDate.Day(), v.PublishDate.Hour(), v.PublishDate.Minute(), v.PublishDate.Second(), v.PublishDate.Nanosecond(), time.Local)
 			item := new(models.Tactics2)
 			itemAuthor := new(models.CygxArticleAuthor)
 			item.ArticleId = v.ArticleId

utils/common.go

@@ -604,7 +604,7 @@ func TimeRemoveHms2(strTime string) string {
 //判断时间是当年的第几周
 func WeekByDate(t time.Time) string {
 	var resultSAtr string
-	t = t.AddDate(0, 0, -8) // 减少八天跟老数据标题统一
+	//t = t.AddDate(0, 0, -8) // 减少八天跟老数据标题统一
 	yearDay := t.YearDay()
 	yearFirstDay := t.AddDate(0, 0, -yearDay+1)
 	firstDayInWeek := int(yearFirstDay.Weekday())