Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/article.go

@@ -938,6 +938,16 @@ func (this *ArticleController) AddStopTime() {
 			}
 			var hasPersion bool
 			slice := strings.Split(articlePermissionPermissionName, ",")
+			//判断用户是否开通了个人研选权限，如果有权限后缀拼接权限名称
+			mfyxUserPermissionTotal := services.GetMfyxUserPermissionTotal(uid)
+			if mfyxUserPermissionTotal == 1 {
+				companyPermission += "," + utils.CHART_PERMISSION_NAME_MF_YANXUAN
+				companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
+			}
+			//如果有研选订阅的权限，那么就拼接一个 买方研选的权限做校验
+			if strings.Contains(companyPermission, utils.CHART_PERMISSION_NAME_MF_YANXUAN) {
+				companyPermission += "," + utils.MAI_FANG_YAN_XUAN_NAME
+			}
 			for _, v := range slice {
 				if strings.Contains(companyPermission, v) {
 					hasPersion = true

services/cygx_yanxuan_special_company.go

@@ -78,10 +78,13 @@ func AddSpecialRecord(user *models.WxUserItem, specialId, stopTime int) (err err
 	var sellerName string
 	//获取销售信息
 	sellerItem, e := models.GetSellerByCompanyIdCheckFicc(user.CompanyId, 2)
-	if e != nil {
+	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetSellerByCompanyIdCheckFicc, Err: " + e.Error())
 		return
 	}
+	if sellerItem == nil {
+		return
+	}
 	sellerName = sellerItem.RealName
 
 	if stopTime >= 3 {

services/send_company_user.go

@@ -613,7 +613,7 @@ func GetShangHaiCrmApiToken() (token string, err error) {
 	var msg string
 	defer func() {
 		if err != nil {
-			go utils.SendAlarmMsg("同步策略平台获取数据信息失败 DeleteUserDotongbuShangHaApi"+err.Error()+msg, 2)
+			go utils.SendAlarmMsg("同步策略平台获取数据信息失败 GetShangHaiCrmApiToken"+err.Error()+msg, 2)
 		}
 	}()
 	cacheKey := utils.SHANG_HAI_CRM_API_TOKEN

services/task.go

@@ -96,8 +96,8 @@ func Task() {
 		reportBillboardUpdate := task.NewTask("reportBillboardUpdate", "0 10 0 * * *", ReportBillboardUpdate) //报告榜单更新
 		task.AddTask("reportBillboardUpdate", reportBillboardUpdate)
 
-		//doActivityOnenIdWxTemplateMsg := task.NewTask("doActivityOnenIdWxTemplateMsg", "0 30 16 * * 0", DoActivityOnenIdWxTemplateMsg) //周日下午四点半推送全部活动
-		//task.AddTask("doActivityOnenIdWxTemplateMsg", doActivityOnenIdWxTemplateMsg)
+		doActivityOnenIdWxTemplateMsg := task.NewTask("doActivityOnenIdWxTemplateMsg", "0 30 16 * * 0", DoActivityOnenIdWxTemplateMsg) //周日下午四点半推送全部活动
+		task.AddTask("doActivityOnenIdWxTemplateMsg", doActivityOnenIdWxTemplateMsg)
 
 		updateCygxActivitySpecialSignupNum := task.NewTask("updateCygxActivitySpecialSignupNum", "0 25 0 * * *", UpdateCygxActivitySpecialSignupNum) //修改专项调研，用户与公司的参与数量
 		task.AddTask("updateCygxActivitySpecialSignupNum", updateCygxActivitySpecialSignupNum)