Merge branch 'cygx_check_table' of http://8.136.199.33:3000/hongze/hongze_task into debug

models/data_manage/activity_special_trip_bill.go

@@ -47,7 +47,7 @@ type CygxActivitySpecialTripBillList struct {
 
 // 添加
 func AddCygxActivitySpecialTripBill(item *CygxActivitySpecialTripBill) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	if err != nil {
 		return
@@ -55,24 +55,12 @@ func AddCygxActivitySpecialTripBill(item *CygxActivitySpecialTripBill) (err erro
 	return
 }
 
-func GetCygxActivitySpecialTripBill(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBill, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT *
-			FROM
-			cygx_activity_special_trip_bill  
-			WHERE 1 = 1 ` + condition
-	_, err = o.Raw(sql, pars).QueryRows(&item)
-	return
-}
-
 func GetCygxActivitySpecialTripBillList(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
-			b.*,
-			c.chart_permission_name 
+			b.*
 		FROM
 			cygx_activity_special_trip_bill AS b
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
 		WHERE
 			1 = 1` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&item)
@@ -84,31 +72,31 @@ type AirborneCount struct {
 	ChartPermissionId int ` description:"品种权限ID"`
 }
 
-// 获取空降的公司报名的记录
-func GetActivitySpecialTripAirborneListByActivitySpecial(condition string, pars []interface{}) (items []*AirborneCount, err error) {
-	sqlCount := ` SELECT chart_permission_id,COUNT(1) AS count
-		FROM
-			cygx_activity_special_meeting_detail AS t
-			INNER JOIN cygx_activity_special AS a ON a.activity_id = t.activity_id 
-		WHERE
-			 1= 1  	AND YEAR ( t.create_time )= YEAR (NOW()) ` + condition + `GROUP BY chart_permission_id`
-	o := orm.NewOrm()
-	_, err = o.Raw(sqlCount, pars).QueryRows(&items)
-	return
-}
-
-// 获取空降的公司报名的记录
-func GetActivitySpecialTripAirborneCountByActivitySpecial(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := ` SELECT COUNT(1) AS count
-		FROM
-			cygx_activity_special_meeting_detail AS t
-			INNER JOIN cygx_activity_special AS a ON a.activity_id = t.activity_id 
-		WHERE
-			 1= 1  	AND YEAR ( t.create_time )= YEAR (NOW()) ` + condition
-	o := orm.NewOrm()
-	err = o.Raw(sqlCount, pars).QueryRow(&count)
-	return
-}
+//// 获取空降的公司报名的记录
+//func GetActivitySpecialTripAirborneListByActivitySpecial(condition string, pars []interface{}) (items []*AirborneCount, err error) {
+//	sqlCount := ` SELECT chart_permission_id,COUNT(1) AS count
+//		FROM
+//			cygx_activity_special_meeting_detail AS t
+//			INNER JOIN cygx_activity_special AS a ON a.activity_id = t.activity_id
+//		WHERE
+//			 1= 1  	AND YEAR ( t.create_time )= YEAR (NOW()) ` + condition + `GROUP BY chart_permission_id`
+//	o := orm.NewOrm()
+//	_, err = o.Raw(sqlCount, pars).QueryRows(&items)
+//	return
+//}
+//
+//// 获取空降的公司报名的记录
+//func GetActivitySpecialTripAirborneCountByActivitySpecial(condition string, pars []interface{}) (count int, err error) {
+//	sqlCount := ` SELECT COUNT(1) AS count
+//		FROM
+//			cygx_activity_special_meeting_detail AS t
+//			INNER JOIN cygx_activity_special AS a ON a.activity_id = t.activity_id
+//		WHERE
+//			 1= 1  	AND YEAR ( t.create_time )= YEAR (NOW()) ` + condition
+//	o := orm.NewOrm()
+//	err = o.Raw(sqlCount, pars).QueryRow(&count)
+//	return
+//}
 
 type CygxActivitySpecialTripBillDetailList struct {
 	Id                  int       `orm:"column(id);pk"`
@@ -132,21 +120,6 @@ type CygxActivitySpecialTripBillDetailList struct {
 	Way                 int       `description:"1报名，取消报名。2到会取消到会 3转正或清零 4取消活动"`
 }
 
-func GetCygxActivitySpecialTripBillDetailList(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillDetailList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			b.*,
-			a.research_theme,
-			c.chart_permission_name 
-		FROM
-			cygx_activity_special_trip_bill AS b
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
-			INNER JOIN cygx_activity_special AS a ON a.activity_id = b.activity_id
-		WHERE
-			1 = 1` + condition
-	_, err = o.Raw(sql, pars).QueryRows(&item)
-	return
-}
 
 type CygxActivitySpecialPointsBillRespItem struct {
 	Id                  int    `gorm:"column:id;primary_key;AUTO_INCREMENT"`
@@ -166,20 +139,3 @@ type CygxActivitySpecialPointsBillResp struct {
 	List []*CygxActivitySpecialPointsBillRespItem
 }
 
-func GetCygxActivitySpecialTripBillDetailListAll(condition string, pars []interface{}) (item []*CygxActivitySpecialTripBillDetailList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			b.*,
-			a.research_theme,
-			c.chart_permission_name 
-		FROM
-			cygx_activity_special_trip_bill AS b
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = b.chart_permission_id 
-			LEFT JOIN cygx_activity_special AS a ON a.activity_id = b.activity_id
-		WHERE
-			1 = 1` + condition
-
-	sql += ` ORDER BY b.create_time DESC`
-	_, err = o.Raw(sql, pars).QueryRows(&item)
-	return
-}

models/data_manage/company_user_type.go

@@ -14,48 +14,13 @@ type CygxCompanyUserType struct {
 	ModifyTime     time.Time `description:"创建时间"`
 }
 
-// 新增权益客户身份类型
-func AddCygxCompanyUserType(item *CygxCompanyUserType) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
-	return
-}
-
-func GetCygxCompanyUserTypeByCompanyId(companyId int) (count int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT COUNT(1) AS count FROM cygx_company_user_type AS a WHERE a.company_id=?  `
-	err = o.Raw(sql, companyId).QueryRow(&count)
-	return
-}
 
-// CygxCompanyUserType 更新权益客户身份类型
-func UpdateCygxCompanyUserType(companyId, useType int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE cygx_company_user_type SET customer_type_id=? WHERE company_id=? `
-	_, err = o.Raw(sql, useType, companyId).Exec()
-	return
-}
 
 // 通过活动ID获取详情
 func GetCygxCompanyUserType(companyId int) (item *CygxCompanyUserType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT *  FROM cygx_company_user_type AS a WHERE a.company_id=?  `
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
 }
 
-// 获取大套餐客户列表
-func GetCygxCompanyUserTypeList() (items []*CygxCompanyUserType, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT *  FROM cygx_company_user_type AS a WHERE a.customer_type_id=2  `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// CygxCompanyUserType 更新权益客户身份类型
-func UpdateCygxCompanyUserTypeAndPackageType(companyId, useType, packageType int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE cygx_company_user_type SET customer_type_id=?, package_type = ? WHERE company_id=? `
-	_, err = o.Raw(sql, useType, packageType, companyId).Exec()
-	return
-}

models/data_manage/cygx_activity_special_points_company.go

@@ -16,29 +16,20 @@ type CygxActivitySpecialInheritPointsCompany struct {
 	ChartPermissionName string    // 品种名称
 }
 
-func AddCygxActivitySpecialPointsCompany(item *CygxActivitySpecialInheritPointsCompany) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
-	if err != nil {
-		return
-	}
-	return
-}
-
 func AddCygxActivitySpecialInheritPointsCompanyMulti(items []*CygxActivitySpecialInheritPointsCompany) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.InsertMulti(1, items)
 	return
 }
 
 func GetCygxActivitySpecialInheritPointsByCompanyId(companyId int) (list []*CygxActivitySpecialInheritPointsCompany, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` SELECT * FROM cygx_activity_special_inherit_points_company WHERE company_id = ?  `
 	_, err = o.Raw(sql,companyId).QueryRows(&list)
 	return
 }
 func DelCygxActivitySpecialInheritPointsByCompanyId(companyId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE FROM cygx_activity_special_inherit_points_company WHERE company_id = ?  `
 	_, err = o.Raw(sql,companyId).Exec()
 	return

models/data_manage/cygx_article.go

@@ -50,7 +50,7 @@ type CygxArticle struct {
 }
 
 func GetReportArticleList(condition string, pars []interface{}) (list []*CygxArticle, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_article WHERE 1=1 AND publish_status = 1`
 	if condition != "" {
 		sql += condition
@@ -58,11 +58,3 @@ func GetReportArticleList(condition string, pars []interface{}) (list []*CygxArt
 	_, err = o.Raw(sql, pars).QueryRows(&list)
 	return
 }
-
-func GetYanXuanArticleIdList() (list *string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT GROUP_CONCAT(DISTINCT article_type_id  SEPARATOR ',') FROM  cygx_article_type `
-
-	err = o.Raw(sql).QueryRow(&list)
-	return
-}

models/data_manage/cygx_article_type.go

@@ -8,7 +8,7 @@ type CygxArticleType struct {
 }
 
 func CygxArticleTypeMappingList() (items []*CygxArticleType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT article_type_id, yanx_permission_id FROM cygx_article_type `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

models/data_manage/cygx_minutes_summary.go

@@ -34,7 +34,7 @@ type CygxMinutesSummaryLog struct {
 }
 
 func AddCygxMinutesSummaryOrm(item *CygxMinutesSummary) (newArtId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newArtId, err = o.Insert(item)
 	if err != nil {
 		return
@@ -43,7 +43,7 @@ func AddCygxMinutesSummaryOrm(item *CygxMinutesSummary) (newArtId int64, err err
 }
 
 func AddCygxMinutesSummaryLogOrm(items []*CygxMinutesSummaryLog) (newArtId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newArtId, err = o.InsertMulti(1, items)
 	if err != nil {
 		return

models/data_manage/cygx_report_mapping.go

@@ -8,7 +8,7 @@ type CygxReportMapping struct {
 }
 
 func CygxReportMappingist() (items []*CygxReportMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT chart_permission_id, category_id FROM cygx_report_mapping `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return

models/data_manage/cygx_research_summary.go

@@ -5,14 +5,6 @@ import (
 	"time"
 )
 
-// GetLatestContractListByProductId 获取最新的续约合同ids
-func GetLatestContractListByProductId(productId int) (contractIds []string, err error) {
-	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT article_id FROM cygx_research_summary WHERE product_id=? AND contract_type="续约合同" GROUP BY create_time DESC,company_id `
-	_, err = o.Raw(sql, productId).QueryRows(&contractIds)
-	return
-}
-
 type CygxResearchSummaryLog struct {
 	ArticleSunId        int       `orm:"column(article_sun_id);pk"description:"子级报告id"`
 	ArticleId           int       `description:"父级报告Id"`
@@ -42,7 +34,7 @@ type CygxResearchSummary struct {
 }
 
 func AddCygxResearchSummaryOrm(item *CygxResearchSummary) (newArtId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newArtId, err = o.Insert(item)
 	if err != nil {
 		return
@@ -51,7 +43,7 @@ func AddCygxResearchSummaryOrm(item *CygxResearchSummary) (newArtId int64, err e
 }
 
 func AddCygxResearchSummaryLogOrm(items []*CygxResearchSummaryLog) (newArtId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	newArtId, err = o.InsertMulti(1, items)
 	if err != nil {
 		return
@@ -74,21 +66,3 @@ type CygxArticleSubjectList struct {
 	ArticleId   int    `description:"报告id"`
 	SubjectName string `description:"标的名称"`
 }
-
-//文章标的列表
-func GetArticleSubjectList(articleId string) (items []*CygxArticleSubjectList, err error) {
-	if articleId == "" {
-		articleId = "0"
-	}
-	o := orm.NewOrm()
-	sql := ` SELECT GROUP_CONCAT( DISTINCT s.subject_name SEPARATOR '#' )  AS subject_name,
-			 sg.article_id
-			FROM
-				cygx_industrial_article_group_subject AS sg
-				LEFT  JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = sg.industrial_subject_id 
-			WHERE
-				sg.article_id IN (` + articleId + `)
-				GROUP BY sg.article_id`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}

models/db.go

@@ -66,6 +66,13 @@ func init() {
 	etaDb, _ := orm.GetDB("eta")
 	etaDb.SetConnMaxLifetime(10 * time.Minute)
 
+	_ = orm.RegisterDataBase("hz_cygx", "mysql", utils.MYSQL_URL_CYGX)
+	orm.SetMaxIdleConns("hz_cygx", 50)
+	orm.SetMaxOpenConns("hz_cygx", 100)
+
+	cygx_db, _ := orm.GetDB("hz_cygx")
+	cygx_db.SetConnMaxLifetime(10 * time.Minute)
+
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)
 

services/cygx/activity_special.go

@@ -205,6 +205,15 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 		err = errors.New("GetCygxActivitySpecialInheritPointsByCompanyId, Err: " + e.Error())
 	}
 
+	listPermissionNameRai,e:= models.GetPermissionByProductIdAndClassifyName(2,"权益")
+	if e != nil && e.Error() != utils.ErrNoRow() {
+		err = errors.New("GetPermissionByProductIdAndClassifyName, Err: " + e.Error())
+	}
+	mapPermissionName := make(map[int]string)
+	for _,v:= range listPermissionNameRai{
+		mapPermissionName[v.ChartPermissionId] = v.ChartPermissionName
+	}
+
 	if companyDetail.Status == "正式" {
 		userType, _, _, _, _ = GetUserType(companyId)
 		var condition string
@@ -221,6 +230,10 @@ func GetChartPermissionSpecialSurplusByCompany(companyId int) (userType int, tri
 			err = errors.New("GetActivitySpecialTripCountByActivitySpecial, Err: " + e.Error())
 			return
 		}
+		for k, v := range listTripBill {
+			listTripBill[k].ChartPermissionName = mapPermissionName[v.ChartPermissionId]
+		}
+
 		if userType == 2 {
 			//condition += ` AND is_valid = 1 `
 			//TripBillNumMap := make(map[int]int)

utils/config.go

@@ -16,6 +16,7 @@ var (
 	MYSQL_URL_GL           string
 	MYSQL_URL_WEEKLY_TRIAL string // ETA试用
 	MYSQL_URL_ETA          string
+	MYSQL_URL_CYGX         string // 查研观向
 
 	REDIS_CACHE string       //缓存地址
 	Rc          *cache.Cache //redis缓存
@@ -143,6 +144,7 @@ func init() {
 	MYSQL_URL_GL = config["mysql_url_gl"]
 	MYSQL_URL_WEEKLY_TRIAL = config["mysql_url_weekly_trial"]
 	MYSQL_URL_ETA = config["mysql_url_eta"]
+	MYSQL_URL_CYGX = config["mysql_url_cygx"]
 
 	REDIS_CACHE = config["beego_cache"]
 	if len(REDIS_CACHE) <= 0 {