Merge branch 'fix_bug_8.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/activity_special.go

@@ -420,6 +420,13 @@ func (this *ActivitySpecialCoAntroller) Tripcancel() {
 		br.ErrMsg = "CancelActivitySpecialTrip,Err:" + err.Error()
 		return
 	}
+
+	err = models.CancelCygxActivitySpecialMeetingDetail(uid, activityId)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "CancelCygxActivitySpecialMeetingDetail,Err:" + err.Error()
+		return
+	}
 	go models.AddCygxActivitySpecialTripBill(itemBill)
 
 	br.Ret = 200

models/activity_special_meeting_detail.go

@@ -25,3 +25,11 @@ func AddCygxActivitySpecialMeetingDetail(item *CygxActivitySpecialMeetingDetail)
 	_, err = o.Insert(item)
 	return
 }
+
+// 取消
+func CancelCygxActivitySpecialMeetingDetail(uid, activityId int) (err error) {
+	o := orm.NewOrm()
+	sql := `DELETE  FROM cygx_activity_special_meeting_detail   WHERE user_id=?  AND activity_id=? `
+	_, err = o.Raw(sql, uid, activityId).Exec()
+	return
+}

models/company_report_permission.go

@@ -33,3 +33,14 @@ func GetCompanyReportPermissionDetailByCondition(condition string, pars []interf
 	err = o.Raw(sql, pars).QueryRow(&item)
 	return
 }
+
+// 列表
+func GetCompanyReportPermissionList(condition string, pars []interface{}) (items []*CompanyReportPermission, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM company_report_permission  WHERE 1= 1 `
+	if condition != "" {
+		sql += condition
+	}
+	_, err = o.Raw(sql, pars).QueryRows(&items)
+	return
+}

services/activity_points.go

@@ -880,6 +880,7 @@ func YanXuanActivityPointsBillSubmitMeetingReduce(log models.YanXuanActivityPoin
 
 // 6:研选审批通过的时候研选扣点更新
 func YanXuanCompanyApprovalReduce(log models.YanXuanActivityPointsRedis) (err error) {
+	time.Sleep(5 * time.Second) // 延迟5秒处理
 	defer func() {
 		if err != nil {
 			fmt.Println(err)

services/article.go

@@ -700,7 +700,10 @@ func GetArticleListByApi(cont context.Context) (err error) {
 //	//	for _, v := range allList {
 //	//		HandleArticleListByApi(v.ArticleId)
 //	//	}
-//	HandleArticleListByApi(8785)
+//
+//	for i := 8648; i < 9004; i++ {
+//		HandleArticleListByApi(i)
+//	}
 //
 //}
 

services/es_comprehensive.go

@@ -46,9 +46,9 @@ type ElasticComprehensiveDetail struct {
 }
 
 //func init() {
-// AddComprehensiveIndustrialSource("Hz", 0)
-//AddComprehensiveArticle(0)
-// AddComprehensiveMeetingreviewchapt()
+//	AddComprehensiveIndustrialSource("Hz", 0)
+//	//AddComprehensiveChart(0)
+//	// AddComprehensiveMeetingreviewchapt()
 //}
 
 // 添加文章：报告、纪要
@@ -106,6 +106,7 @@ func AddComprehensiveArticle(articleId int) {
 	}
 	//indexName := utils.IndexNameComprehensive
 	for _, v := range articleList {
+		time.Sleep(200 * time.Millisecond)
 		content := html.UnescapeString(v.Body)
 		doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
 		if err != nil {
@@ -155,6 +156,7 @@ func AddComprehensiveChart(chartId int) {
 	}
 	//indexName := utils.IndexNameComprehensive
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		item := new(ElasticComprehensiveDetail)
 		item.SourceId = v.ChartId
 		item.Source = "newchart"
@@ -210,6 +212,7 @@ func AddComprehensiveIndustrialSource(sourceType string, articleId int) {
 	}
 	//indexName := utils.IndexNameComprehensive
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		item := new(ElasticComprehensiveDetail)
 		item.SourceId = v.IndustrialManagementId
 		item.Source = industrialsource
@@ -223,6 +226,7 @@ func AddComprehensiveIndustrialSource(sourceType string, articleId int) {
 				item.PublishDate = maplistMeetingTime[v.IndustrialManagementId].Format(utils.FormatDateTime)
 			}
 		}
+		fmt.Println(item)
 		EsAddOrEditComprehensiveData(item)
 	}
 }
@@ -240,6 +244,7 @@ func AddComprehensiveMeetingreviewchapt() {
 	}
 	//indexName := utils.IndexNameComprehensive
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		content := html.UnescapeString(v.Content)
 		doc, err := goquery.NewDocumentFromReader(strings.NewReader(content))
 		if err != nil {
@@ -302,6 +307,7 @@ func AddComprehensiveActivity() {
 
 	//return
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		item := new(ElasticComprehensiveDetail)
 		item.SourceId = v.ActivityId
 		//item.IsSummary = v.IsSummary
@@ -363,6 +369,7 @@ func AddComprehensiveActivitySpecial() {
 		mapActivitySubject[v.ActivityId] = append(mapActivitySubject[v.ActivityId], IndustrialSubjectMap[v.IndustrialSubjectId])
 	}
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		item := new(ElasticComprehensiveDetail)
 		item.SourceId = v.ActivityId
 		item.Source = "activityspecial"
@@ -452,6 +459,7 @@ func AddComprehensiveActivityVideo() {
 
 	//indexName := utils.IndexNameComprehensive
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		item := new(ElasticComprehensiveDetail)
 		item.SourceId = v.Id
 		item.Source = "activityvideo"
@@ -538,6 +546,7 @@ func AddComprehensiveActivityVoice() {
 	}
 	//indexName := utils.IndexNameComprehensive
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		item := new(ElasticComprehensiveDetail)
 		item.SourceId = v.ActivityVoiceId
 		item.Source = "activityvoice"
@@ -563,6 +572,7 @@ func AddComprehensiveRoadshow() {
 	}
 	//indexName := utils.IndexNameComprehensive
 	for _, v := range list {
+		time.Sleep(200 * time.Millisecond)
 		item := new(ElasticComprehensiveDetail)
 		item.SourceId = v.VideoId
 		item.Source = "roadshow"

services/send_company_user.go

@@ -108,15 +108,20 @@ func SendComapnyToShanghai(url, jsonCompany, postType string) (err error) {
 }
 
 func DotongbuShangHai(cont context.Context) (err error) {
-	//func DotongbuShangHai() (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go utils.SendAlarmMsg("把权限信息同步到上海策略品台失败，DotongbuShangHai："+err.Error(), 2)
+		}
+	}()
 	//先删除被禁用的用户
 	DeleteUserDotongbuShangHaiApi()
 	var condition string
 	updateTime := time.Now().Add(-time.Minute * 22).Format("2006-01-02 15:04:05")
-	listUpdateUser, err := models.GetWxUserOpLog(updateTime)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		fmt.Println(err)
-		return err
+	listUpdateUser, e := models.GetWxUserOpLog(updateTime)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetWxUserOpLog, Err: " + e.Error())
+		return
 	}
 	var companyIds string
 	if len(listUpdateUser) > 0 {
@@ -125,9 +130,10 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 	////获取冻结跟流失的客户
-	listFreezeAndLoss, err := models.GetCompanyFreezeAndLoss(updateTime)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return err
+	listFreezeAndLoss, e := models.GetCompanyFreezeAndLoss(updateTime)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCompanyFreezeAndLoss, Err: " + e.Error())
+		return
 	}
 	if len(listFreezeAndLoss) > 0 {
 		for _, v := range listFreezeAndLoss {
@@ -135,9 +141,10 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 
-	listDeleteUser, err := models.GetWxUserOpLogDelete(updateTime)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return err
+	listDeleteUser, e := models.GetWxUserOpLogDelete(updateTime)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetWxUserOpLogDelete, Err: " + e.Error())
+		return
 	}
 
 	////获取删除客户
@@ -148,9 +155,10 @@ func DotongbuShangHai(cont context.Context) (err error) {
 	}
 
 	//获取指定时间内被移动的客户
-	listOperationRecord, err := models.GetCompanyOperationRecord(updateTime)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		return err
+	listOperationRecord, e := models.GetCompanyOperationRecord(updateTime)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCompanyOperationRecord, Err: " + e.Error())
+		return
 	}
 	if len(listOperationRecord) > 0 {
 		for _, v := range listOperationRecord {
@@ -158,6 +166,22 @@ func DotongbuShangHai(cont context.Context) (err error) {
 		}
 	}
 
+	//获取正式转试用的客户ID
+	var conditionPer string
+	var parsPer []interface{}
+	conditionPer += "  AND product_id = 2  AND modify_time > ?  GROUP BY company_id   "
+	parsPer = append(parsPer, updateTime)
+	companyReportPermissionList, e := models.GetCompanyReportPermissionList(conditionPer, parsPer)
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetCompanyReportPermissionList, Err: " + e.Error())
+		return
+	}
+	if len(companyReportPermissionList) > 0 {
+		for _, v := range companyReportPermissionList {
+			companyIds += strconv.Itoa(v.CompanyId) + ","
+		}
+	}
+
 	condition = ` AND p.is_suspend = 0  AND a.modify_time > ` + "'" + updateTime + "'"
 	companyIds = strings.TrimRight(companyIds, ",")