Merge branch 'cygx_13.8' of http://8.136.199.33:3000/hongze/hongze_clpt into debug

controllers/report.go

@@ -916,6 +916,9 @@ func (this *MobileReportController) SearchReport() {
 				ButtonStyle:     styleMap[v.ArticleTypeId],
 				List:            v.List,
 			}
+			if v.ReportId > 0 {
+				item.Resource = 3
+			}
 			resp.ListHz = append(resp.ListHz, &item)
 		}
 
@@ -995,6 +998,9 @@ func (this *MobileReportController) SearchReport() {
 				ButtonStyle:     styleMap[v.ArticleTypeId],
 				List:            v.List,
 			}
+			if v.ReportId > 0 {
+				item.Resource = 3
+			}
 			if v.IsSpecial == 1 {
 				//去除图片标签
 				item.Annotation = utils.ArticleRemoveImgUrl(item.Annotation)

models/cygx_seller_mobile_map.go

@@ -0,0 +1,19 @@
+package models
+
+import "github.com/beego/beego/v2/client/orm"
+
+//权益销售手机号映射关系表
+
+type CygxSellerMobileMap struct {
+	RealName       string `description:"销售姓名"`
+	Mobile         string `description:"销售手机号"`
+	ServerRealName string `description:"服务销售姓名"`
+	ServerMobile   string `description:"服务销售手机号"`
+}
+
+func GetCygxSellerMobileMap() (items []*CygxSellerMobileMap, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT *  FROM cygx_seller_mobile_map  LIMIT  100 `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/cygx_yanxuan_special.go

@@ -323,3 +323,10 @@ func UpdateYanxuanSpecialMomentsImg(momentsImg string, id int) (err error) {
 	_, err = o.Raw(sql, momentsImg, id).Exec()
 	return
 }
+
+func GetYanxuanSpecialListByconditioninit() (items []*CygxYanxuanSpecialItem, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT a.* FROM cygx_yanxuan_special AS a WHERE 1=1 AND moments_img is NULL`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/report.go

@@ -860,6 +860,7 @@ type ArticleResearchResp struct {
 	CompanyTags     []string                     `description:"研选专栏公司标签"`
 	SpecialColumnId int                          `description:"专栏栏目id"`
 	TopTime         int                          `description:"置顶时间"`
+	Resource        int                          `description:"来源类型，1：文章、2：产品内测、3：FICC研报"`
 }
 
 // 获取数量

services/es_comprehensive.go

@@ -311,6 +311,7 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 	var yanxuanSpecialIds []int       // 研选专栏
 	var askserieVideoIds []string     //问答系列视频
 	var reportselectionIds []int      //报告精选
+	var ficcreporrtIds []string       //FICC研报
 	//Source      string    `description:"资源类型 报告 ：article 、图表 ：newchart、微路演 ：roadshow、活动 ：activity、活动视频：activityvideo、活动音频：activityvoice、专项调研活动：activityspecial 、 本周研究汇总： researchsummary 、 上周纪要汇总 ：minutessummary 、晨会精华 ：meetingreviewchapt  、 产品内测：productinterior
 	for _, v := range list {
 		if v.Source == "article" {
@@ -346,6 +347,8 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 			askserieVideoIds = append(askserieVideoIds, strconv.Itoa(v.SourceId))
 		} else if v.Source == "reportselection" {
 			reportselectionIds = append(reportselectionIds, v.SourceId)
+		} else if v.Source == utils.CYGX_OBJ_FICC_REPORT {
+			ficcreporrtIds = append(ficcreporrtIds, strconv.Itoa(v.SourceId))
 		}
 	}
 	detail, e := models.GetConfigByCode("city_img_url")
@@ -803,49 +806,35 @@ func GetResourceDataEsList(list []*SearchComprehensiveItem, user *models.WxUserI
 		}
 	}
 
+	//处理FICC研报
+	if len(ficcreporrtIds) > 0 {
+		pars = make([]interface{}, 0)
+		condition = ` AND a.report_id IN (` + utils.GetOrmInReplace(len(ficcreporrtIds)) + `)`
+		pars = append(pars, ficcreporrtIds)
+		articleList, e := models.GetHomeListPublic(condition, pars, 0, len(ficcreporrtIds))
+		if e != nil {
+			err = errors.New("GetHomeListPublic, Err: " + e.Error())
+			return
+		}
+
+		articleList, e = HandleArticleCategoryImg(articleList, user)
+		if e != nil {
+			err = errors.New("HandleArticleCategoryImg, Err: " + e.Error())
+			return
+		}
+		for _, v := range articleList {
+			v.Body = ""
+			mapItems[fmt.Sprint("ficcreport", v.ReportId)].FiccReport = v
+		}
+	}
+
 	for _, vList := range list {
 		for _, v := range mapItems {
 			//如果这些类型都为空，那么就不合并
-			if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil && v.YanxuanSpecial == nil && v.AskserieVideo == nil && v.ReportSelection == nil {
+			if v.Article == nil && v.Newchart == nil && v.Roadshow == nil && v.Activity == nil && v.Activityvideo == nil && v.Activityvoice == nil && v.Activityspecial == nil && v.Researchsummary == nil && v.Minutessummary == nil && v.Meetingreviewchapt == nil && v.ProductInterior == nil && v.IndustrialResource == nil && v.YanxuanSpecial == nil && v.AskserieVideo == nil && v.ReportSelection == nil && v.FiccReport == nil {
 				continue
 			}
-			//if v.Article != nil && v.SourceId == vList.SourceId {
-			//	v.Article.Title = vList.Title
-			//}
-			//if v.Newchart != nil && v.SourceId == vList.SourceId {
-			//	v.Newchart.Title = vList.Title
-			//}
-			//if v.Roadshow != nil && v.SourceId == vList.SourceId {
-			//	v.Roadshow.Title = vList.Title
-			//}
-			//if v.Activity != nil && v.SourceId == vList.SourceId {
-			//	v.Activity.ActivityName = vList.Title
-			//}
-			//if v.Activityvideo != nil && v.SourceId == vList.SourceId {
-			//	v.Activityvideo.Title = vList.Title
-			//}
-			//if v.Activityvoice != nil && v.SourceId == vList.SourceId {
-			//	v.Activityvoice.Title = vList.Title
-			//}
-			//
-			//if v.Activityspecial != nil && v.SourceId == vList.SourceId {
-			//	v.Activityspecial.ResearchTheme = vList.Title
-			//}
-			//if v.Researchsummary != nil && v.SourceId == vList.SourceId {
-			//	v.Researchsummary.Title = vList.Title
-			//}
-			//if v.Minutessummary != nil && v.SourceId == vList.SourceId {
-			//	v.Minutessummary.Title = vList.Title
-			//}
-			//if v.ProductInterior != nil && v.SourceId == vList.SourceId {
-			//	v.ProductInterior.Title = vList.Title
-			//}
-			//if v.IndustrialResource != nil && v.SourceId == vList.SourceId && v.Source == vList.Source {
-			//	v.IndustrialResource.UpdateTime = strings.Replace(vList.PublishDate, "00:00:00", "", -1)
-			//}
-			//if v.YanxuanSpecial != nil && v.SourceId == vList.SourceId {
-			//	v.YanxuanSpecial.Title = vList.Title
-			//}
+
 			if v.SourceId == vList.SourceId && v.Source == vList.Source {
 				items = append(items, v)
 			}

services/html2Img.go

@@ -67,7 +67,15 @@ func Html2ImgHttpPost(url, postData string, params ...string) ([]byte, error) {
 }
 
 //func init() {
-//	MakeYanxuanSpecialMomentsImg(185)
+//	//MakeYanxuanSpecialMomentsImg(185)
+//	list, err := models.GetYanxuanSpecialListByconditioninit()
+//	if err != nil {
+//		fmt.Println(err)
+//	}
+//	for _, v := range list {
+//		fmt.Println(v.Id)
+//		MakeYanxuanSpecialMomentsImg(v.Id)
+//	}
 //}
 
 // 生成研选专栏分享到朋友圈的图片

services/wechat_send_category_template_msg.go

@@ -509,7 +509,7 @@ func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, com
 	}()
 
 	//潜在客户、未开权益，已开FICC的客户推给王芳，开通权益的客户推给对应销售
-	mobileOpneid := utils.WxMsgTemplateIdAskMsgMobilePublic
+	mobileOpenid := utils.WxMsgTemplateIdAskMsgMobilePublic
 	if companyId > 1 {
 		raiCount, e := models.GetCompanyProductCount(companyId, utils.COMPANY_PRODUCT_RAI_ID)
 		if e != nil {
@@ -529,14 +529,25 @@ func SendPermissionApplyTemplateMsgAdminByYxCategory(req models.ApplyTryReq, com
 					err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 					return
 				}
-				mobileOpneid = sealldetail.Mobile + "," + adminShare.Mobile
+				listSellerMobile, e := models.GetCygxSellerMobileMap()
+				if e != nil {
+					err = errors.New("GetCygxSellerMobileMap, Err: " + e.Error())
+					return
+				}
+				//mapMobile := make(map[string]string)
+				for _, vm := range listSellerMobile {
+					if adminShare.Mobile == vm.ServerMobile {
+						adminShare.Mobile = vm.Mobile
+					}
+				}
+				mobileOpenid = sealldetail.Mobile + "," + adminShare.Mobile
 			} else {
-				mobileOpneid = sealldetail.Mobile
+				mobileOpenid = sealldetail.Mobile
 			}
 		}
 	}
 
-	openIdList, e := models.GetMfyxWxOpenIdByMobileList(mobileOpneid)
+	openIdList, e := models.GetMfyxWxOpenIdByMobileList(mobileOpenid)
 	if e != nil {
 		err = errors.New("GetMfyxWxOpenIdByMobileList, Err: " + e.Error())
 		return err

services/wechat_send_msg.go

@@ -108,6 +108,17 @@ func SendPermissionApplyTemplateMsg(realName, companyName, mobile, applyMethod,
 				err = errors.New("GetSellerByAdminId, Err: " + e.Error())
 				return
 			}
+			listSellerMobile, e := models.GetCygxSellerMobileMap()
+			if e != nil {
+				err = errors.New("GetCygxSellerMobileMap, Err: " + e.Error())
+				return
+			}
+			//mapMobile := make(map[string]string)
+			for _, vm := range listSellerMobile {
+				if adminShare.Mobile == vm.ServerMobile {
+					adminShare.Mobile = vm.Mobile
+				}
+			}
 			mobileOpenid = sealldetail.Mobile + "," + adminShare.Mobile
 		} else {
 			mobileOpenid = sealldetail.Mobile