Merge branch 'cygx/cygx_12.6.1' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity.go

@@ -822,6 +822,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			cygxService.UpdateActivityResourceData(req.ActivityId)                                             //写入首页最新  cygx_resource_data 表
 			go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, 1) //活动发布以及取消发布处理研选扣点
 		}
+
 		//如果二次编辑的时候，取消了易董办会选项，那么就对易董发送取消发布到广场的通知
 		if req.IsYidongConduct == 0 {
 			go cygxService.YiDongUpdateActivityStatus(activityId)
@@ -1281,7 +1282,6 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
 		go cygxService.DoActivityOnenIdWxTemplateMsg(activityId)
 		//go cygxService.UpdateResourceData(activityId, "activity", "add", time.Now().Format(utils.FormatDateTime))
 
-		cygxService.UpdateActivityResourceData(activityId) //写入首页最新  cygx_resource_data 表
 	} else {
 		item.PublishStatus = 0
 		item.IsCancel = 1
@@ -1290,7 +1290,6 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
 		go services.SendWxMsgWithCygxActivity(req.ActivityId)
 		//同步活动到最新数据表
 		//go cygxService.UpdateResourceData(req.ActivityId, "activity", "delete", "")
-		cygxService.UpdateActivityResourceData(activityId) //写入首页最新  cygx_resource_data 表
 	}
 	item.ActivityId = req.ActivityId
 	if item.PublishStatus == 1 {
@@ -1317,8 +1316,8 @@ func (this *ActivityCoAntroller) PublishAndCancel() {
 		go cygxService.YiDongUpdateActivityPublish(activityId)
 	}
 	go cygxService.YanXuanActivityPointsBillActivityPublishAndCancel(activityId, AdminUser.AdminId, item.PublishStatus) //活动发布以及取消发布处理研选扣点
-
-	go elastic.AddComprehensiveActivity(activityId) // 同步Es添加活动
+	go elastic.AddComprehensiveActivity(activityId)                                                                     // 同步Es添加活动
+	go cygxService.UpdateActivityResourceData(activityId)                                                               //写入首页最新  cygx_resource_data 表
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"

controllers/cygx/tag_management.go

@@ -329,6 +329,24 @@ func (this *TagManagementController) TagSave() {
 		br.ErrMsg = "标签名为空"
 		return
 	}
+
+	tagName := req.TagName
+	tagId := req.TagId
+	var condition string
+	var pars []interface{}
+	condition = " AND tag_name = ? AND tag_id != ?  "
+	pars = append(pars, tagName, tagId)
+	total, err := cygx.GetCygxTagListCount(condition)
+	if err != nil {
+		br.Msg = "编辑标签失败"
+		br.ErrMsg = "获取标签总数失败,Err:" + err.Error()
+		return
+	}
+	if total > 0 {
+		br.Msg = "标签名称已存在"
+		br.ErrMsg = "标签名称已存在,TagName:" + tagName
+		return
+	}
 	if req.TagId > 0 {
 		item := cygx.CygxTag{
 			TagId:         int64(req.TagId),

models/cygx/cygx_tag.go

@@ -29,7 +29,7 @@ func AddCygxTag(item *CygxTag) (id int64, err error) {
 
 // 通过ID获取分类详情
 func GetCygxTagInfoById(tagId int) (item *CygxTagList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_tag WHERE tag_id=?`
 	err = o.Raw(sql, tagId).QueryRow(&item)
 	return
@@ -85,6 +85,15 @@ func GetCygxTagListCount(cond string) (count int, err error) {
 	return
 }
 
+// 获取tag列表-总数
+func GetCygxTagListCountByCondition(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	sql := `SELECT COUNT(1) AS count FROM cygx_tag  WHERE 1=1  ` + condition
+
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
+}
+
 // 获取tag列表-分页
 func GetCygxTagListPage(cond string, startSize, pageSize int) (items []*CygxTagList, err error) {
 	o := orm.NewOrmUsingDB("hz_cygx")

services/cygx/acitvity.go

@@ -827,7 +827,7 @@ func IsShowAppointmentByadminSet(IsCanAppointmentMinutes int) (isShowAppointment
 }
 
 //func init() {
-//	DoActivityOnenIdWxTemplateMsg(2621)
+//	DoActivityOnenIdWxTemplateMsg(2703)
 //}
 
 // 处理活动是否进行模板消息推送
@@ -987,6 +987,7 @@ func DoActivityOnenIdWxTemplateMsg(activityId int) (err error) {
 		}
 		var conditionPer string
 		var parsPer []interface{}
+		companyIdsRecord = append(companyIdsRecord, 0)
 		conditionPer = ` AND r.company_id IN (  ` + utils.GetOrmInReplace(len(companyIdsRecord)) + `) `
 		parsPer = append(parsPer, companyIdsRecord)
 		companyReportPermissionItemList, e := cygx.GetCompanyReportPermissionItem(conditionPer, parsPer)

services/cygx/resource_data.go

@@ -26,7 +26,7 @@ import (
 //roadshow
 
 //func init() {
-//	UpdateMicroRoadshowResourceData(1)
+//	UpdateActivityResourceData(2703)
 //}
 
 // 更新活动