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

services/activity_points.go

@@ -1506,7 +1506,7 @@ func ActivitySpecialCompanyApprovalReduce(log models.YanXuanActivityPointsRedis)
 	}
 
 	companyPoints, e := company.GetCompanyContractPermissionPointsCount(companyContractId)
-	if e != nil {
+	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetCompanyContractPermissionPointsCount, Err: " + e.Error())
 		return
 	}

services/activity_special.go

@@ -982,7 +982,7 @@ func GetSpecialDetailUserPower(user *models.WxUserItem, activityInfo *models.Cyg
 		}
 	}
 
-	permissionStr, e := GetCompanyPermissionUpgrade(user.CompanyId)
+	permissionStr, e := GetCompanyPermission(user.CompanyId)
 	if e != nil {
 		err = errors.New("GetCompanyPermissionUpgrade, Err: " + e.Error())
 		return

services/task.go

@@ -179,8 +179,8 @@ func Task() {
 	//	task.AddTask("getArticleListByApi", getArticleListByApi)
 	//}
 
-	go UserLabelLogReduce() // 处理用户标签的队列消息
-	//go YanXuanActivityPointsBillReduce()                    // 处理研选活动扣点
+	go UserLabelLogReduce()                                 // 处理用户标签的队列消息
+	go YanXuanActivityPointsBillReduce()                    // 处理研选活动扣点
 	go UpdateArticleByRedis()                               // 处理策略平台同步过来的文章
 	go UpdateIndustrialManagementTimeLineDateList3ByRedis() // 处理产业管理时间线相关内容的数据
 	go UpdateWxUserRaiLabelRedis()                          // 处理用户标签队列消息CRM_16.5