Merge branch 'cygx_check_table' of http://8.136.199.33:3000/cxzhang/hongze_clpt into cygx_12.0

models/activity.go

@@ -332,14 +332,13 @@ func GetActivityListNew(condition string, pars []interface{}, uid, startSize, pa
 	}
 
 	o := orm.NewOrm()
-	sql := `SELECT art.* ,t.activity_type,t.img_url_text,c.image_url as  img_url,1 AS source_type,
+	sql := `SELECT art.* ,t.activity_type,t.img_url_text,1 AS source_type,
 		( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ?   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS is_signup,
 		( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id   AND s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num,
 		( SELECT COUNT( 1 ) FROM cygx_activity_meeting_reminder AS m WHERE m.activity_id = art.activity_id AND m.user_id = ?  AND m.is_cancel = 0  ) AS is_cancel_meeting_reminder,
 		( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = art.activity_id AND ap.user_id = ? ) AS is_appointment
 		FROM cygx_activity as art
-		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id
-		INNER JOIN  chart_permission  AS c ON c.chart_permission_id = art.chart_permission_id ` + sqlJiontable + ` WHERE 1= 1 `
+		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id ` + sqlJiontable + ` WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}
@@ -369,8 +368,7 @@ func GetActivityListHomeNew(condition string, startSize, pageSize int) (items []
 	o := orm.NewOrm()
 	sql := `SELECT activity_id
 		FROM cygx_activity as art
-		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id
-		INNER JOIN  chart_permission  AS c ON c.chart_permission_id = art.chart_permission_id  WHERE 1= 1 `
+		INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id WHERE 1= 1 `
 	if condition != "" {
 		sql += condition
 	}
@@ -530,7 +528,7 @@ SELECT COUNT( 1 ) AS count FROM
 // 我的日程列表
 func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageSize int) (items []*ActivityDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT art.*,t.activity_type,t.img_url_text,c.image_url as  img_url,
+	sql := `SELECT art.*,t.activity_type,t.img_url_text,
 			( SELECT COUNT( 1 ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND s.user_id = ? AND s.is_cancel = 0 AND s.do_fail_type = 0) AS is_signup,
             ( SELECT COUNT( DISTINCT user_id ) FROM cygx_activity_signup AS s WHERE s.activity_id = art.activity_id AND  s.is_cancel = 0  AND s.do_fail_type = 0) AS signup_num ,
 			( SELECT COUNT( 1 ) FROM cygx_activity_appointment AS ap WHERE ap.activity_id = art.activity_id AND ap.user_id = ? ) AS is_appointment,
@@ -539,7 +537,6 @@ func GetScheduleList(condition string, pars []interface{}, uid, startSize, pageS
             FROM cygx_activity AS art
 			INNER JOIN cygx_my_schedule as my ON my.activity_id = art.activity_id 
 			INNER JOIN cygx_activity_type  as t ON t.activity_type_id = art.activity_type_id
-			INNER JOIN  chart_permission  AS c ON c.chart_permission_id = art.chart_permission_id 
             WHERE 1=1 AND my.user_id = ? `
 	if condition != "" {
 		sql += condition
@@ -584,7 +581,6 @@ func GetScheduleAndSpecilList(condition string, pars []interface{}, conditionSpe
 			cygx_activity AS art
 			INNER JOIN cygx_my_schedule AS my ON my.activity_id = art.activity_id
 			INNER JOIN cygx_activity_type AS t ON t.activity_type_id = art.activity_type_id
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = art.chart_permission_id 
 		WHERE
 			1 = 1 `
 	if condition != `` {

models/activity_special.go

@@ -91,7 +91,6 @@ func GetCygxActivitySpecialDetailList(condition string, pars []interface{}, uid,
 	o := orm.NewOrm()
 	sql := ` SELECT
 	art.*,
-	c.image_url AS img_url,
 	(
 	SELECT
 		COUNT( 1 ) 
@@ -103,7 +102,6 @@ func GetCygxActivitySpecialDetailList(condition string, pars []interface{}, uid,
 	) AS is_signup
 FROM
 	cygx_activity_special AS art
-	INNER JOIN chart_permission AS c ON c.chart_permission_id = art.chart_permission_id 
 WHERE
 	1 = 1 `
 	if condition != "" {

models/activity_special_signup.go

@@ -30,14 +30,14 @@ type SignupSpecialStatus struct {
 	SignupStatus  int    `description:"返回状态：1：成功 、2 ：人数已满 、3：调研次数已用完、 4：超时"`
 }
 
-//添加
+// 添加
 func AddCygxActivitySpecialSignup(item *CygxActivitySpecialSignup) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Insert(item)
 	return
 }
 
-//获取某一用户的报名的数量
+// 获取某一用户的报名的数量
 func GetUserCygxActivitySpecialSignup(uid, activityId int) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_signup  WHERE  user_id=?  AND   activity_id =? `
 	o := orm.NewOrm()
@@ -45,7 +45,7 @@ func GetUserCygxActivitySpecialSignup(uid, activityId int) (count int, err error
 	return
 }
 
-//删除
+// 删除
 func DeleteCygxActivitySpecialSignup(uid, activityId int) (err error) {
 	o := orm.NewOrm()
 	sql := `DELETE  FROM cygx_activity_special_signup   WHERE   user_id=?   AND  activity_id=?    `
@@ -53,7 +53,7 @@ func DeleteCygxActivitySpecialSignup(uid, activityId int) (err error) {
 	return
 }
 
-//列表
+// 列表
 func GetActivityListSpecialAll(activityId int) (items []*CygxActivitySpecialSignup, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*  FROM cygx_activity_special_signup as art WHERE 1= 1 AND  activity_id = ?  GROUP BY company_id`
@@ -61,7 +61,7 @@ func GetActivityListSpecialAll(activityId int) (items []*CygxActivitySpecialSign
 	return
 }
 
-//列表
+// 列表
 func GetActivityListSpecialByActivityId(activityId int) (items []*CygxActivitySpecialSignup, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*  FROM cygx_activity_special_signup as art WHERE 1= 1 AND  activity_id = ? `
@@ -83,20 +83,19 @@ type CygxActivitySpecialSignupResp struct {
 	Count       string    `description:"所属销售"`
 }
 
-//列表
+// 列表
 func GetActivityListSpecialGroupByMobile(condition string, pars []interface{}) (items []*CygxActivitySpecialSignupResp, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT s.*,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup as s INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id ` + condition + `  GROUP BY s.mobile`
+	sql := `SELECT s.*,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup as s INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id ` + condition + `  GROUP BY s.mobile`
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
-//列表
+// 列表
 func GetActivityListSpecialGroupByCompanyId(condition string, pars []interface{}) (items []*CygxActivitySpecialSignupResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT *,	COUNT( 1 ) AS count   FROM cygx_activity_special_signup   as s INNER JOIN cygx_activity_special AS a ON a.activity_id = s.activity_id
-			INNER JOIN wx_user AS u ON u.user_id = s.user_id ` + condition + `  GROUP BY s.company_id`
+			 ` + condition + `  GROUP BY s.company_id`
 	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/activity_special_trip.go

@@ -51,7 +51,7 @@ func GetCygxActivitySpecialTripList(condition string, pars []interface{}) (item
 	return
 }
 
-//获取某一用户的报名的数量
+// 获取某一用户的报名的数量
 func GetUserActivitySpecialTripCount(uid, activityId int) (count int, err error) {
 	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip  WHERE  user_id=?  AND   activity_id =? `
 	o := orm.NewOrm()
@@ -59,15 +59,15 @@ func GetUserActivitySpecialTripCount(uid, activityId int) (count int, err error)
 	return
 }
 
-//获取某一活动的报名的数量
+// 获取某一活动的报名的数量
 func GetActivitySpecialTripCountByActivityId(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip as t   INNER JOIN wx_user as  u on u.user_id = t.user_id WHERE    1 = 1 ` + condition
+	sqlCount := `SELECT COUNT(1) AS count FROM cygx_activity_special_trip as t    WHERE    1 = 1 ` + condition
 	o := orm.NewOrm()
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
 
-//获取某一活动的报名的数量 (同时关联活动类型进行获取)
+// 获取某一活动的报名的数量 (同时关联活动类型进行获取)
 func GetActivitySpecialTripCountByActivitySpecial(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count
 		FROM
@@ -80,7 +80,7 @@ func GetActivitySpecialTripCountByActivitySpecial(condition string, pars []inter
 	return
 }
 
-//获取空降的公司报名的记录
+// 获取空降的公司报名的记录
 func GetActivitySpecialTripAirborneCountByActivitySpecial(condition string, pars []interface{}) (count int, err error) {
 	sqlCount := ` SELECT COUNT(1) AS count
 		FROM
@@ -93,14 +93,14 @@ func GetActivitySpecialTripAirborneCountByActivitySpecial(condition string, pars
 	return
 }
 
-//添加
+// 添加
 func AddCygxActivitySpecialTrip(item *CygxActivitySpecialTrip) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Insert(item)
 	return
 }
 
-//取消
+// 取消
 func CancelActivitySpecialTrip(uid int, item *CygxActivitySpecialDetail) (err error) {
 	o := orm.NewOrm()
 	sql := `DELETE  FROM cygx_activity_special_trip   WHERE user_id=?  AND activity_id=? `
@@ -108,7 +108,7 @@ func CancelActivitySpecialTrip(uid int, item *CygxActivitySpecialDetail) (err er
 	return
 }
 
-//CancelActivitySpecialTripIsValid  处理活动报名是否有效
+// CancelActivitySpecialTripIsValid  处理活动报名是否有效
 func CancelActivitySpecialTripIsValid(isValid, activityId, userId int) (err error) {
 	sql := ` UPDATE cygx_activity_special_trip SET  is_valid= ?,is_cancel = 1  WHERE activity_id = ? AND  user_id = ? `
 	o := orm.NewOrm()

models/admin.go

@@ -10,7 +10,7 @@ type AdminMobileResp struct {
 
 // 获取销售所能查看到的手机号
 func GetAdminByRole() (items []*AdminMobileResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT mobile  FROM admin  WHERE role = 'admin' `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -18,7 +18,7 @@ func GetAdminByRole() (items []*AdminMobileResp, err error) {
 
 // 获取权益内部人员手机号
 func GetRaiAdmin() (items []*AdminMobileResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT
 			mobile
 		FROM
@@ -36,7 +36,7 @@ func GetRaiAdmin() (items []*AdminMobileResp, err error) {
 
 // 根据角色名称获取手机号
 func GetAdminByRoleName(roleName string) (items []*AdminMobileResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT mobile  FROM admin  WHERE role_name =? ' `
 	_, err = o.Raw(sql, roleName).QueryRows(&items)
 	return

models/apply_record.go

@@ -25,7 +25,7 @@ type CygxApplyRecord struct {
 }
 
 func AddApplyRecord(item *CygxApplyRecord) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("weekly_report").Begin()
 	if err != nil {
 		return
 	}

models/article.go

@@ -132,9 +132,9 @@ func GetArticleFollowDetail(articleId, uid int) (item *ArticleFollowDetail, err
 	//d_num 作者被关注的数量 、 md_num 本人是否关注这个作者 、ac_num 文章被收藏的数量 、 mac_num 本人是否收藏这个文章
 	o := orm.NewOrm()
 	sql := ` SELECT
-	( SELECT count( 1 ) FROM cygx_article_department_follow AS af INNER JOIN wx_user as u ON  u.user_id = af.user_id  WHERE af.department_id = art.department_id AND af.type = 1 ) AS d_num,
+	( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.department_id = art.department_id AND af.type = 1 ) AS d_num,
 	( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.department_id = art.department_id AND af.type = 1 AND af.user_id = ? ) AS md_num,
-	( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = art.article_id  ) AS ac_num,
+	( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = art.article_id  ) AS ac_num,
 	( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = art.article_id  AND ac.user_id = ? ) AS mac_num
 FROM
 	cygx_article AS art
@@ -196,8 +196,8 @@ func GetArticleCollectionList(condition string, userId int) (items []*ArticleCol
 			d.nick_name,
 			d.department_id,
 			( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id  ) AS collect_num, 
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac    WHERE ac.article_id = a.article_id  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac    WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS my_collect_num
 		FROM
 			cygx_article AS a

models/article_collect.go

@@ -113,7 +113,6 @@ func GetUserArticleCollectList() (items []*CygxArticleCollectCountRep, err error
 			f.article_id 
 		FROM
 			cygx_article_collect AS f
-			INNER JOIN wx_user AS u ON u.user_id = f.user_id
 			INNER JOIN cygx_article AS a ON a.article_id = f.article_id 
 		WHERE
 			1 = 1 
@@ -150,8 +149,8 @@ func GetArticleCollectNum(articleId []string, uid int) (items []*CygxArticleNum,
 	sql := `SELECT
 			a.article_id,
 			( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id  ) AS collect_num, 
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = a.article_id  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS is_collect
 		FROM
 			cygx_article AS a WHERE  1 = 1  AND  article_id IN  (` + utils.GetOrmInReplace(lenarticleId) + `) `

models/article_department.go

@@ -82,7 +82,7 @@ func GetDepartmentList(condition, conditionOrder string, userId, startSize, page
 			d.img_url,
 			MAX( a.publish_date ) AS publish_date,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS f  WHERE f.department_id = d.department_id  AND user_id =?  AND f.type= 1  ) AS fllow_num,
-			( SELECT count( 1 ) FROM cygx_article_department_follow  AS f INNER JOIN wx_user AS u ON u.user_id = f.user_id  WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac INNER JOIN wx_user AS u ON u.user_id = ac.user_id  WHERE ac.article_id IN (SELECT article_id FROM cygx_article WHERE department_id = d.department_id ) 	AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS sum_num
+			( SELECT count( 1 ) FROM cygx_article_department_follow  AS f   WHERE f.department_id = d.department_id AND f.type= 1 ) +( SELECT count( 1 ) FROM cygx_article_collect AS ac  WHERE ac.article_id IN (SELECT article_id FROM cygx_article WHERE department_id = d.department_id ) 	AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS sum_num
 		FROM
 		cygx_article_department AS d
 			INNER JOIN cygx_article AS a ON d.department_id = a.department_id
@@ -136,9 +136,9 @@ func GetDepartmentDetail(userId, departmentId int, condition string) (item Depar
 			d.nick_name,
 			d.img_url,
 			( SELECT count( 1 ) FROM cygx_article_department_follow AS af WHERE af.user_id = ? AND af.department_id = d.department_id AND af.type= 1 ) AS my_fllow_num,
-			( SELECT count( 1 ) FROM cygx_article_department_follow AS f INNER JOIN wx_user as u ON  u.user_id = f.user_id   WHERE f.department_id = d.department_id  AND f.type= 1 ) AS fllow_num,
+			( SELECT count( 1 ) FROM cygx_article_department_follow AS f    WHERE f.department_id = d.department_id  AND f.type= 1 ) AS fllow_num,
 			( SELECT count( 1 ) FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` ) AS article_num,
-			( SELECT count( 1 ) FROM cygx_article_collect  AS c INNER JOIN wx_user as u ON  u.user_id = c.user_id   WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` )) AS collect_num
+			( SELECT count( 1 ) FROM cygx_article_collect  AS c   WHERE c.article_id IN (SELECT  article_id FROM cygx_article AS a WHERE a.department_id = d.department_id  ` + condition + ` )) AS collect_num
 		FROM
 			cygx_article_department AS d 
 		WHERE

models/chart_permission.go

@@ -39,7 +39,7 @@ type ChartPermissionListResp struct {
 }
 
 func GetChartPermissionReportAll(condition string) (items []*ChartPermissionResp, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND is_report=1 AND permission_type!=2 ` + condition + ` ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
@@ -66,7 +66,7 @@ func GetCategoryIdHome(chartPermissionId int) (category_id string, err error) {
 }
 
 func GetChartPermissionById(chartPermissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ? `
 	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	return

models/clpt_user_record.go

@@ -1,8 +1,6 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
-	"hongze/hongze_clpt/utils"
 	"time"
 )
 
@@ -24,65 +22,3 @@ type CygxClptUserRecord struct {
 	SessionKey     string    `description:"微信小程序会话密钥，最大长度：255"`
 	UserId         int       `description:"用户id"`
 }
-
-//根据openid获取用户关系
-func GetCygxClptUserRecordByOpenId(openId string) (item *CygxClptUserRecord, err error) {
-	sql := `SELECT * FROM user_record WHERE open_id=? `
-	err = orm.NewOrm().Raw(sql, openId).QueryRow(&item)
-	return
-}
-
-//根据openid获取用户关系
-func GetCygxClptUserRecordByUnionId(unionId string) (item *UserRecord, err error) {
-	sql := `SELECT * FROM user_record WHERE union_id=? AND create_platform = 4  `
-	err = orm.NewOrm().Raw(sql, unionId).QueryRow(&item)
-	return
-}
-
-//根据openid解除绑定用户关系
-func UnBindCygxClptUserRecordByOpenid(openId string) (err error) {
-	o := orm.NewOrm()
-	msql := ` UPDATE user_record SET user_id = 0,bind_account="" WHERE open_id = ? `
-	_, err = o.Raw(msql, openId).Exec()
-	return
-}
-
-//根据用户id和平台id获取用户关系
-func GetCygxClptUserRecordByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
-
-	var sql string
-	if utils.RunMode == "release" {
-		sql = `SELECT cr.open_id,user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE create_platform=? AND bind_account = ?`
-	} else {
-		platform = 1
-		sql = `SELECT open_id,user_id FROM	user_record  WHERE create_platform =? AND bind_account = ?`
-	}
-
-	err = orm.NewOrm().Raw(sql, platform, bindAccount).QueryRow(&item)
-	return
-}
-
-//根据openid绑定用户关系
-func BindCygxClptUserRecordByOpenid(userId int, openId, bindAccount string) (err error) {
-	o := orm.NewOrm()
-	msql := " UPDATE user_record SET user_id = ?,bind_account=? WHERE open_id = ? "
-	_, err = o.Raw(msql, userId, bindAccount, openId).Exec()
-	return
-}
-
-//修改用户微信信息
-func ModifyCygxClptUserRecordByDetail(openId, unionId, nickName, headimgUrl, city, province, country string, sex, userId int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE user_record SET union_id=?, nick_name=?,headimgurl=?,sex=?,city=?,province=?,country=? WHERE user_id=? and open_id=? `
-	_, err = o.Raw(sql, unionId, nickName, headimgUrl, sex, city, province, country, userId, openId).Exec()
-	return
-}
-
-//添加用户关系
-func AddCygxClptUserRecord(record *CygxClptUserRecord) (recordId int64, err error) {
-	o := orm.NewOrm()
-	recordId, err = o.Insert(record)
-	return
-}

models/company.go

@@ -28,7 +28,7 @@ func GetCompanyDetailById(companyId int) (item *CompanyDetail, err error) {
 			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
 			WHERE a.company_id=? AND cp.cygx_auth=1
 			OR (a.company_id = ? AND  cp.permission_name = '策略' ) ORDER BY  b.product_id  DESC LIMIT 1` // 兼容永续状态
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId, companyId).QueryRow(&item)
 	return
 }
@@ -43,7 +43,7 @@ func GetCompanyDetailByIdGroup(companyId int) (item *CompanyDetail, err error) {
 			WHERE a.company_id=? AND b.product_id = 2 
 			OR (a.company_id = ? AND  cp.permission_name = '策略' ) 
 			ORDER BY b.product_id DESC  LIMIT 0,1 `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId, companyId).QueryRow(&item)
 	return
 }
@@ -56,7 +56,7 @@ func GetCountCompanyDetailByIdGroup(companyId int) (count int, err error) {
 			INNER JOIN chart_permission AS cp ON cp.chart_permission_id = p.chart_permission_id
 			LEFT JOIN admin AS c ON b.seller_id=c.admin_id
 			WHERE a.company_id=? AND b.product_id = 2    OR (a.company_id = ? AND  cp.permission_name = '策略' )   `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId, companyId).QueryRow(&count)
 	return
 }
@@ -86,12 +86,12 @@ func GetCompanyPermissionByUser(companyId int) (permission string, err error) {
             AND b.cygx_auth=1
 			AND c.status IN('正式','试用','永续')
 			AND a.status IN('正式','试用','永续') `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return
 }
 
-//获取用户权限不限制状态
+// 获取用户权限不限制状态
 func GetCompanyPermissionByUserNoStatus(companyId int) (permission string, err error) {
 	sql := ` SELECT GROUP_CONCAT(DISTINCT b.remark  ORDER BY b.sort ASC  SEPARATOR ',') AS permission
 			FROM company_report_permission AS a
@@ -100,12 +100,12 @@ func GetCompanyPermissionByUserNoStatus(companyId int) (permission string, err e
 			WHERE  a.company_id=?
 			AND c.is_suspend=0
             AND b.cygx_auth=1`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return
 }
 
-//获取正式权限
+// 获取正式权限
 func GetCompanyPermissionByUserZhengShi(companyId int) (permission string, err error) {
 	sql := ` SELECT GROUP_CONCAT(DISTINCT b.remark  ORDER BY b.sort ASC  SEPARATOR ',') AS permission
 			FROM company_report_permission AS a
@@ -116,7 +116,7 @@ func GetCompanyPermissionByUserZhengShi(companyId int) (permission string, err e
             AND b.cygx_auth=1
 			AND c.status IN('正式')
 			AND a.status IN('正式') `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return
 }
@@ -129,7 +129,7 @@ func GetCompanyPermissionByName(name string) (permission string, err error) {
 			INNER JOIN company AS cm ON cm.company_id=c.company_id 
 			WHERE  cm.company_name=?
 			AND b.product_id = 2 `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, name).QueryRow(&permission)
 	return
 }
@@ -144,12 +144,12 @@ func GetCompanyDetailAllById(companyId int) (item *CompanyDetail, err error) {
 			WHERE a.company_id=? AND cp.cygx_auth=1
 			OR (a.company_id = ? AND  cp.permission_name = '策略' )` // 兼容永续状态
 	//WHERE a.company_id=?  AND b.status IN('正式','试用','永续')`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId, companyId).QueryRow(&item)
 	return
 }
 
-//获取对应销售以及销售的手机号
+// 获取对应销售以及销售的手机号
 func GetSellerDetailAllByCompanyId(companyId int) (item *CompanyDetail, err error) {
 	sql := ` SELECT c.mobile ,c.real_name as seller_name
 			FROM
@@ -159,7 +159,7 @@ func GetSellerDetailAllByCompanyId(companyId int) (item *CompanyDetail, err erro
 			WHERE
 			b.product_id = 2 
 			AND a.company_id = ? LIMIT 1`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&item)
 	return
 }
@@ -171,7 +171,7 @@ func GetCompanySellerName(companyId int) (sellerName string, err error) {
 			company_product AS p
 		WHERE
 			p.company_id = ? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&sellerName)
 	return
 }
@@ -185,10 +185,10 @@ type CompanyProductDetial struct {
 	Scale     string `description:"管理规模，空不填，1：:50亿以下，2：50~100亿，3：100亿以上。多个用, 隔开"`
 }
 
-//获取对应销售以及销售的手机号
+// 获取对应销售以及销售的手机号
 func GetCompanyProductDetail(companyId, productId int) (item *CompanyProductDetial, err error) {
 	sql := ` SELECT * FROM company_product WHERE company_id = ? AND product_id = ?; `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId, productId).QueryRow(&item)
 	return
 }
@@ -210,7 +210,7 @@ func GetCompanyPermissionList(companyId int) (items []*PermissionItem, err error
             AND b.cygx_auth=1
 			AND c.status IN('正式','试用','永续')
 			AND a.status IN('正式','试用','永续')   ORDER BY b.sort ASC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	_, err = o.Raw(sql, companyId).QueryRows(&items)
 	return
-}
+}

models/company_activity_trip.go

@@ -3,7 +3,7 @@ package models
 import "github.com/beego/beego/v2/client/orm"
 
 func GetCountCompanyDetailByIdGroupTrip(companyId int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT
 	COUNT( 1 ) AS count 
 FROM
@@ -26,7 +26,7 @@ WHERE
 }
 
 func GetCompanyDetailByIdGroupTrip(companyId int) (item *CompanyDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT a.company_id,a.company_name,b.status,b.seller_id,b.seller_name,c.mobile ,b.is_suspend
             FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
@@ -40,7 +40,7 @@ func GetCompanyDetailByIdGroupTrip(companyId int) (item *CompanyDetail, err erro
 }
 
 func GetCompanyPermissionByUserTrip(companyId int) (permission string, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT
 			GROUP_CONCAT( DISTINCT b.remark ORDER BY b.sort ASC SEPARATOR ',' ) AS permission 
 		FROM
@@ -70,14 +70,14 @@ func GetCompanyPermissionByUserZhengShiTrip(companyId int) (permission string, e
 			AND c.is_suspend=0
             AND b.cygx_auth=1
 			AND ( a.is_upgrade = 1 AND c.STATUS = '正式' OR c.STATUS = '永续' ) `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return
 }
 
 // GetCompanyReportPermissionUpgrade 获取升级的权限类型
 func GetCompanyReportPermissionUpgrade(companyId, productId int) (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT
 	re.*
 FROM
@@ -103,14 +103,14 @@ func GetChartPermissionByIds(permissionIds []string) (list []*ChartPermission, e
 	sql := qb.String()
 
 	// 执行 SQL 语句
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
 // GetCompanyPermissionNameCheck 通过名称判断客户是否开了某一类型的权限
 func GetCompanyPermissionNameCheck(companyId, productId int, permissionName string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT
 			COUNT( 1 ) AS count 
 		FROM
@@ -125,10 +125,9 @@ func GetCompanyPermissionNameCheck(companyId, productId int, permissionName stri
 	return
 }
 
-
 // GetCompanyReportPermissionByCompanyIdAndProductId 获取权限类型
 func GetCompanyReportPermissionByCompanyIdAndProductId(companyId, productId int) (items []*CompanyReportPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT
 	re.*
 FROM
@@ -140,4 +139,4 @@ WHERE
 	AND STATUS = '正式' `
 	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
 	return
-}
+}

models/cygx_user_record.go

@@ -18,22 +18,22 @@ type CygxUserRecord struct {
 	CreateTime   time.Time `description:"创建时间，关系添加时间、用户授权时间"`
 }
 
-//添加
+// 添加
 func AddCygxUserRecord(item *CygxUserRecord) (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
-//获取数量
+// 获取数量
 func GetCygxUserRecordCount(openId string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM user_record WHERE open_id=? `
 	err = o.Raw(sqlCount, openId).QueryRow(&count)
 	return
 }
 
-//修改
+// 修改
 func UpdateCygxUserRecord(item *CygxUserRecord) (err error) {
 	o := orm.NewOrm()
 	msql := ` UPDATE cygx_user_record SET nick_name = ?,sex=?,province=?,city=? ,country=? ,headimgurl=?  WHERE open_id = ? `
@@ -41,9 +41,9 @@ func UpdateCygxUserRecord(item *CygxUserRecord) (err error) {
 	return
 }
 
-//修改
+// 修改
 func UpdateUserRecord(item *CygxUserRecord) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	msql := ` UPDATE user_record SET nick_name = ?,sex=?,province=?,city=? ,country=? ,headimgurl=?  WHERE union_id = ? AND create_platform = 4  `
 	_, err = o.Raw(msql, item.NickName, item.Sex, item.Province, item.City, item.Country, item.Headimgurl, item.UnionId).Exec()
 	return

models/db.go

@@ -10,11 +10,18 @@ import (
 
 func init() {
 
-	_ = orm.RegisterDataBase("default", "mysql", utils.MYSQL_URL)
+	_ = orm.RegisterDataBase("default", "mysql", utils.MYSQL_URL_CYGX)
 	orm.SetMaxIdleConns("default", 50)
 	orm.SetMaxOpenConns("default", 100)
 
-	db, _ := orm.GetDB("default")
+	cygx_db, _ := orm.GetDB("default")
+	cygx_db.SetConnMaxLifetime(10 * time.Minute)
+
+	_ = orm.RegisterDataBase("weekly_report", "mysql", utils.MYSQL_URL)
+	orm.SetMaxIdleConns("weekly_report", 50)
+	orm.SetMaxOpenConns("weekly_report", 100)
+
+	db, _ := orm.GetDB("weekly_report")
 	db.SetConnMaxLifetime(10 * time.Minute)
 
 	_ = orm.RegisterDataBase("rddp", "mysql", utils.MYSQL_URL_RDDP)

models/industrial_activity_group_management.go

@@ -42,14 +42,12 @@ func GetActivityIndustryRelationList(condition string, pars []interface{}) (list
 func GetIndustrialActivityGroupManagementList(activityId int) (items []*IndustrialManagementRep, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-			p.permission_name,
-			p.chart_permission_id,
+			m.chart_permission_id,
 			m.industrial_management_id,
 			m.industry_name 
 			FROM
 			cygx_industrial_activity_group_management AS am
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = am.industrial_management_id
-			INNER JOIN chart_permission AS p ON p.chart_permission_id = m.chart_permission_id 
 			WHERE
 			am.activity_id = ? AND am.source = 1`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)

models/industry_fllow.go

@@ -28,7 +28,7 @@ type CygxCategoryFllowRep struct {
 	CategoryId int `description:"分类ID"`
 }
 
-//根据手机号获取用户关注的产业
+// 根据手机号获取用户关注的产业
 func GetCygxIndustryFllowList(mobile string) (items []*CygxIndustryFllow, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM cygx_industry_fllow WHERE mobile = ?`
@@ -40,21 +40,21 @@ type CygxIndustryFllowResp struct {
 	Status int `description:"1:关注，2：取消关注"`
 }
 
-//获取数量
+// 获取数量
 func GetCountCygxIndustryFllowByUid(userId int) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM cygx_industry_fllow WHERE user_id=? `
 	err = orm.NewOrm().Raw(sql, userId).QueryRow(&count)
 	return
 }
 
-//添加
+// 添加
 func AddCygxIndustryFllow(item *CygxIndustryFllow) (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
 }
 
-//删除
+// 删除
 func RemoveCygxIndustryFllow(userId, industrialManagementId int) (err error) {
 	o := orm.NewOrm()
 	sql := `DELETE FROM cygx_industry_fllow WHERE user_id=? AND industrial_management_id=? `
@@ -62,7 +62,7 @@ func RemoveCygxIndustryFllow(userId, industrialManagementId int) (err error) {
 	return
 }
 
-//获取某个用户关注某个行业下的产业数量
+// 获取某个用户关注某个行业下的产业数量
 func GetCountCygxIndustryFllowByUidAndChartPermissionId(userId, ChartPermissionId int) (count int, err error) {
 	sql := `SELECT
 			COUNT( 1 ) AS count 
@@ -76,7 +76,7 @@ func GetCountCygxIndustryFllowByUidAndChartPermissionId(userId, ChartPermissionI
 	return
 }
 
-//获取用户关注的产业列表
+// 获取用户关注的产业列表
 func GetUserFllowIndustrialList(userId int) (items []*CygxIndustryFllow, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -85,7 +85,6 @@ func GetUserFllowIndustrialList(userId int) (items []*CygxIndustryFllow, err err
 			m.industrial_management_id 
 		FROM
 			cygx_industry_fllow AS f
-			INNER JOIN wx_user AS u ON f.user_id = u.user_id
 			INNER JOIN cygx_industrial_management AS m ON m.industrial_management_id = f.industrial_management_id 
 		WHERE
 			1 = 1 

models/minutesSummary.go

@@ -82,10 +82,9 @@ func GetMinutesSummarylogListAllV4(articleId int) (items []*ResearchSummaryChart
 // 列表
 func GetMinutesSummarylogListAll(articleId int) (items []*MinutesSummaryChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.image_url,l.*
+	sql := `SELECT l.*
 			FROM
 			cygx_minutes_summary_log AS l
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			WHERE l.article_id = ? 
 			GROUP BY l.chart_permission_id
 			ORDER BY l.chart_permission_sort ASC   `

models/report.go

@@ -535,8 +535,8 @@ func GetReportCollectionBillboardListYx(limit int, pars []interface{}, condition
 			d.nick_name,
 			d.department_id,
 			( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id  ) AS collect_num, 
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collection_num
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = a.article_id  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac    WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collection_num
 		FROM
 			cygx_article AS a
 			INNER JOIN cygx_article_collect AS ac ON ac.article_id = a.article_id 
@@ -875,14 +875,14 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 			d.nick_name,
 			d.department_id,
 			( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id  ) AS collect_num, 
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac    WHERE ac.article_id = a.article_id  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac   WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS my_collect_num,
 			0 AS is_special,
 			0 AS special_type,
 			0 AS special_column_id,
 			'' AS company_tags, 
-			'' AS industry_tags 
+			'' AS industry_tags
 		FROM
 			cygx_article AS a
 			LEFT JOIN cygx_industrial_article_group_management AS mg ON mg.article_id = a.article_id
@@ -906,7 +906,7 @@ func GetArticleResearchList(condition string, pars []interface{}, startSize, pag
 		b.nick_name AS nick_name,
 		0 AS department_id,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_record AS h WHERE h.yanxuan_special_id = a.id ) AS pv,
-		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.yanxuan_special_id = a.id  ) AS collect_num,
+		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac   WHERE ac.yanxuan_special_id = a.id  ) AS collect_num,
 		0 AS collect_num_order,
 		( SELECT count( 1 ) FROM cygx_yanxuan_special_collect AS ac WHERE ac.yanxuan_special_id = a.id  AND user_id = ? ) AS my_collect_num,
 		1 AS is_special,
@@ -940,8 +940,8 @@ func GetArticleResearchListHz(condition string, pars []interface{}, startSize, p
 			a.category_id,
 			a.article_type_id,
 			( SELECT count( 1 ) FROM cygx_article_history_record_newpv AS h WHERE h.article_id = a.article_id ) AS pv,
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id  ) AS collect_num, 
-			( SELECT count( 1 ) FROM cygx_article_collect AS ac  INNER JOIN wx_user as u ON  u.user_id = ac.user_id  WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac  WHERE ac.article_id = a.article_id  ) AS collect_num, 
+			( SELECT count( 1 ) FROM cygx_article_collect AS ac    WHERE ac.article_id = a.article_id AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( ac.create_time )  ) AS collect_num_order, 
 			( SELECT count( 1 ) FROM cygx_article_collect AS ac WHERE ac.article_id = a.article_id  AND user_id = ? ) AS my_collect_num
 		FROM
 			cygx_article AS a

models/report_selection.go

@@ -147,10 +147,9 @@ func GetReportSelectionListHome(condition, tbdb string, pars []interface{}, star
 // 列表
 func GetReportSelectionlogListAll(articleId int) (items []*CygxReportSelectionLog, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.image_url,s.subject_name , l.*  ,l.company_label as label
+	sql := `SELECT c.permission_name ,s.subject_name , l.*  ,l.company_label as label
 			FROM
 			cygx_report_selection_log AS l
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			INNER JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id 
 			WHERE l.article_id = ? `
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
@@ -160,10 +159,9 @@ func GetReportSelectionlogListAll(articleId int) (items []*CygxReportSelectionLo
 // 列表
 func GetReportSelectionlogSonListAll(articleId, chartPermissionId int) (items []*CygxReportSelectionLogDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name , l.* ,l.company_label as label
+	sql := `SELECT  l.* ,l.company_label as label
 			FROM
 			cygx_report_selection_log AS l
-			INNER JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			LEFT JOIN cygx_industrial_subject AS s ON s.industrial_subject_id = l.industrial_subject_id 
 			WHERE l.article_id = ? AND l.chart_permission_id =?`
 	_, err = o.Raw(sql, articleId, chartPermissionId).QueryRows(&items)

models/report_selection_chart_log.go

@@ -27,9 +27,8 @@ type AddCygxReportSelectionChartLog struct {
 
 func GetCygxReportSelectionChartLogRepList(articleId int) (items []*CygxReportSelectionChartLogRep, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT l.*,c.chart_permission_name
+	sql := `SELECT l.*
 			FROM cygx_report_selection_chart_log AS l
-			LEFT JOIN chart_permission as c  ON c.chart_permission_id = l.chart_permission_id
 			WHERE  1= 1 AND article_id=?  `
 	_, err = o.Raw(sql, articleId).QueryRows(&items)
 	return

models/researchSummary.go

@@ -89,10 +89,9 @@ func GetResearchSummarylogListFirst(articleId int) (items []*ResearchSummaryChar
 // 列表
 func GetResearchSummarylogSonListSecond(articleId int, artType string) (items []*CygxResearchSummaryLogSecond, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT c.permission_name ,c.chart_permission_id ,c.image_url_m as image_url, l.* 
+	sql := `SELECT l.* 
 			FROM
 			cygx_research_summary_log AS l
-			LEFT JOIN chart_permission AS c ON c.chart_permission_id = l.chart_permission_id 
 			WHERE l.article_id = ? AND l.type =?
 			GROUP BY l.chart_permission_id
 			ORDER  BY l.chart_permission_sort ASC`

models/search.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
 
@@ -21,16 +20,16 @@ type CategoryItem struct {
 	CategoryName string
 }
 
-func GetCategoryByCompanyId(companyId int) (items []*CategoryItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT b.chart_permission_id,d.category_name FROM company_product AS a
-			INNER JOIN company_report_permission AS b ON a.company_id=b.company_id AND a.product_id=b.product_id
-			INNER JOIN cygx_permission_mapping AS d ON b.chart_permission_id=d.chart_permission_id
-			WHERE a.product_id=2
-			AND a.company_id=?`
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
-	return
-}
+//func GetCategoryByCompanyId(companyId int) (items []*CategoryItem, err error) {
+//	o := orm.NewOrm()
+//	sql := `SELECT b.chart_permission_id,d.category_name FROM company_product AS a
+//			INNER JOIN company_report_permission AS b ON a.company_id=b.company_id AND a.product_id=b.product_id
+//			INNER JOIN cygx_permission_mapping AS d ON b.chart_permission_id=d.chart_permission_id
+//			WHERE a.product_id=2
+//			AND a.company_id=?`
+//	_, err = o.Raw(sql, companyId).QueryRows(&items)
+//	return
+//}
 
 type SearchResp struct {
 	Paging    *paging.PagingItem

models/seller.go

@@ -21,7 +21,7 @@ type AdminItem struct {
 }
 
 func GetSellerByCompanyId(companyId int) (item *AdminItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT b.*,c.open_id,c.user_id,a.company_name FROM company_product AS a
 			INNER JOIN admin AS b ON a.seller_id=b.admin_id
 			LEFT JOIN wx_user AS c ON b.mobile=c.mobile
@@ -31,7 +31,7 @@ func GetSellerByCompanyId(companyId int) (item *AdminItem, err error) {
 }
 
 func GetSellerByCompanyIdCheckFicc(companyId, productId int) (item *AdminItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT b.*,c.open_id,c.user_id,a.company_name FROM company_product AS a
 			INNER JOIN admin AS b ON a.seller_id=b.admin_id
 			LEFT JOIN wx_user AS c ON b.mobile=c.mobile
@@ -41,15 +41,15 @@ func GetSellerByCompanyIdCheckFicc(companyId, productId int) (item *AdminItem, e
 }
 
 func GetSellerByName(userName string) (item *AdminItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT * FROM admin WHERE real_name=? `
 	err = o.Raw(sql, userName).QueryRow(&item)
 	return
 }
 
-//获取本组的销售ID
+// 获取本组的销售ID
 func GetSelleridWhichGroup(companyId, productId int) (adminId string, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT
 			GROUP_CONCAT( DISTINCT admin_id SEPARATOR ',' ) AS adminId
 			FROM
@@ -71,7 +71,7 @@ func GetSelleridWhichGroup(companyId, productId int) (adminId string, err error)
 }
 
 func GetSellerByAdminId(adminId int) (item *AdminItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` SELECT * FROM admin WHERE admin_id=?  `
 	err = o.Raw(sql, adminId).QueryRow(&item)
 	return

models/user.go

@@ -25,14 +25,14 @@ type UserDetail struct {
 }
 
 func GetUserDetailByUserId(userId int) (item *UserDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM wx_user WHERE user_id = ? `
 	err = o.Raw(sql, userId).QueryRow(&item)
 	return
 }
 
 func GetUserDetailByMobile(mobile string) (item *UserDetail, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM wx_user WHERE mobile = ? `
 	err = o.Raw(sql, mobile).QueryRow(&item)
 	return
@@ -64,7 +64,7 @@ func PcBindMobile(unionId, mobile string, userId, loginType int) (wxUserId int,
 		sql = "SELECT * FROM wx_user WHERE email = ? "
 	}
 	user := new(WxUser)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, mobile).QueryRow(&user)
 
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -216,7 +216,7 @@ func GetCompanyPermission(companyId int) (permission string, err error) {
             AND b.cygx_auth=1
 			AND c.status IN('正式','试用','永续')
 			AND a.status IN('正式','试用','永续') `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return
 }
@@ -231,7 +231,7 @@ func GetCompanyPermissionName(companyId int) (permission string, err error) {
             AND b.cygx_auth=1
 			AND c.status IN('正式','试用','永续')
 			AND a.status IN('正式','试用','永续') `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&permission)
 	return
 }
@@ -246,14 +246,14 @@ func GetCompanyPermissionId(companyId int) (permissionId string, err error) {
             AND b.cygx_auth=1
 			AND c.status IN('正式','试用','永续')
 			AND a.status IN('正式','试用','永续') `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	err = o.Raw(sql, companyId).QueryRow(&permissionId)
 	return
 }
 
 // 用户绑定手机号时同时绑定外呼手机号
 func BindUserOutboundMobile(mobile, countryCode string, userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE wx_user SET outbound_mobile=? ,outbound_country_code = ?, country_code= ? WHERE user_id=? `
 	_, err = o.Raw(sql, mobile, countryCode, countryCode, userId).Exec()
 	return
@@ -269,7 +269,7 @@ type UserPermissionAuthInfo struct {
 
 // 修改用户是否绑定外呼手机号弹窗
 func ModifyWxUserIsMsgOutboundMobile(userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE wx_user SET is_msg_outbound_mobile=1 WHERE user_id=? `
 	_, err = o.Raw(sql, userId).Exec()
 	return
@@ -277,7 +277,7 @@ func ModifyWxUserIsMsgOutboundMobile(userId int) (err error) {
 
 // 已经绑定手机号，没有绑定外呼手机号的的用户，预约外呼的时候，将外呼手机号同步成手机号
 func BindUserOutboundMobileByMobile(mobile, countryCode string, userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE wx_user SET outbound_mobile=? ,outbound_country_code = ? WHERE user_id=? `
 	_, err = o.Raw(sql, mobile, countryCode, userId).Exec()
 	return
@@ -290,7 +290,7 @@ func GetWxUserByMobiles(mobiles []string) (items []*WxUser, err error) {
 		return
 	}
 	sql := `SELECT* FROM wx_user  WHERE mobile in (` + utils.GetOrmInReplace(lenmobiles) + `)  `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	_, err = o.Raw(sql, mobiles).QueryRows(&items)
 	return
 }
@@ -310,13 +310,13 @@ func GetUserCompanyPermissionSand(companyId int) (items []*ChartPermissionResp,
 			AND b.chart_permission_name != '专家'
 			GROUP BY b.chart_permission_name
 			ORDER BY b.sort ASC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	_, err = o.Raw(sql, companyId).QueryRows(&items)
 	return
 }
 
 func AddOutboundMobile(item *OutboundMobileItem, userId int) (err error) {
-	o, err := orm.NewOrm().Begin()
+	o, err := orm.NewOrmUsingDB("weekly_report").Begin()
 	if err != nil {
 		return
 	}
@@ -346,7 +346,7 @@ type Headimgurl struct {
 
 // 更改用户头像
 func UpdateUserHeadimgurl(headimgurl string, userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE wx_user SET headimgurl = ? WHERE user_id=? `
 	_, err = o.Raw(sql, headimgurl, userId).Exec()
 	return
@@ -354,7 +354,7 @@ func UpdateUserHeadimgurl(headimgurl string, userId int) (err error) {
 
 // 更改用户邮箱号
 func UpdateUserEmail(email string, userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE wx_user SET email = ? WHERE user_id=? `
 	_, err = o.Raw(sql, email, userId).Exec()
 	return

models/user_label.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -28,48 +27,3 @@ type CygxUserLabel struct {
 	CreateTime time.Time `description:"创建时间"`
 	ModifyTime time.Time `description:"更新时间"`
 }
-
-// 获取数量
-func GetCygxUserLabelCount(condition string, pars []interface{}) (count int, err error) {
-	sqlCount := ` SELECT COUNT(1) AS count  FROM cygx_user_label as art WHERE 1= 1   AND modify_time > DATE_SUB(CURDATE(), INTERVAL 3 MONTH)  `
-	if condition != "" {
-		sqlCount += condition
-	}
-	o := orm.NewOrm()
-	err = o.Raw(sqlCount, pars).QueryRow(&count)
-	return
-}
-
-// 添加
-func AddCygxUserLabel(item *CygxUserLabel) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-// 修改是否关注
-func UpdateCygxUserLabelIsFollow(isFollow, sourceId, source, userId int, label string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE cygx_user_label SET is_follow=?,label = ? , modify_time=NOW()  WHERE source_id=? AND source = ? AND user_id = ? `
-	_, err = o.Raw(sql, isFollow, label, sourceId, source, userId).Exec()
-	return
-}
-
-// 修改对应标签权重+1
-func UpdateCygxUserLabelWeight(sourceId, source, userId int, label string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE cygx_user_label SET weight = weight +1 ,label = ? , modify_time=NOW()  WHERE source_id=? AND source = ? AND  user_id = ? `
-	_, err = o.Raw(sql, label, sourceId, source, userId).Exec()
-	return
-}
-
-// 列表
-func GetCygxUserLabelList(condition string, pars []interface{}) (items []*CygxUserLabel, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_user_label as art WHERE 1= 1   AND modify_time > DATE_SUB(CURDATE(), INTERVAL 3 MONTH)	`
-	if condition != "" {
-		sql += condition
-	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-	return
-}

models/user_label_article.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"github.com/beego/beego/v2/client/orm"
 	"time"
 )
 
@@ -19,10 +18,3 @@ type CygxUserLabelArticle struct {
 	CreateTime time.Time `description:"创建时间"`
 	ModifyTime time.Time `description:"更新时间"`
 }
-
-// 添加
-func AddCygxUserLabelArticle(item *CygxUserLabelArticle) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}

models/user_record.go

@@ -3,6 +3,7 @@ package models
 import (
 	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_clpt/utils"
+	"strings"
 	"time"
 )
 
@@ -27,29 +28,31 @@ type UserRecord struct {
 
 // 添加
 func AddUserRecord(item *UserRecord) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	lastId, err = o.Insert(item)
 	return
 }
 
 // 根据openid获取用户关系
 func GetUserRecordByOpenId(openId string) (item *UserRecord, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM user_record WHERE open_id=? `
-	err = orm.NewOrm().Raw(sql, openId).QueryRow(&item)
+	err = o.Raw(sql, openId).QueryRow(&item)
 	return
 }
 
 // 根据openid获取用户关系
 // 4是查研观向   create_platform
 func GetUserRecordByUnionId(unionId string) (item *UserRecord, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM user_record WHERE union_id=? AND create_platform = 4  `
-	err = orm.NewOrm().Raw(sql, unionId).QueryRow(&item)
+	err = o.Raw(sql, unionId).QueryRow(&item)
 	return
 }
 
 // 根据openid解除绑定用户关系
 func UnBindUserRecordByOpenid(openId string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	msql := ` UPDATE user_record SET user_id = 0,bind_account="" WHERE open_id = ? `
 	_, err = o.Raw(msql, openId).Exec()
 	return
@@ -62,40 +65,49 @@ type OpenIdList struct {
 
 // 根据用户id和平台id获取用户关系
 func GetUserRecordByMobile(platform int, bindAccount string) (item *OpenIdList, err error) {
-
 	var sql string
-	if utils.RunMode == "release" {
-		sql = `SELECT cr.open_id,user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE create_platform=? AND bind_account = ?`
-	} else {
-		platform = 1
-		sql = `SELECT open_id,user_id FROM	user_record  WHERE create_platform =? AND bind_account = ?`
-	}
-
-	err = orm.NewOrm().Raw(sql, platform, bindAccount).QueryRow(&item)
+	sql = `SELECT union_id,cygx_user_id AS user_id  FROM	cygx_user_record  WHERE	1 = 1  AND cygx_bind_account = ?`
+	err = orm.NewOrm().Raw(sql, bindAccount).QueryRow(&item)
 	return
 }
 
 func GetWxOpenIdByMobileList(mobile string) (items []*OpenIdList, err error) {
-	//sql := `SELECT * FROM user_record WHERE bind_account IN (` + utils.WxMsgTemplateIdAskMsgMobile + `) AND create_platform = 1`
-	sql := `SELECT cr.*,user_id FROM user_record  as c
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = c.union_id
-			WHERE bind_account IN (` + mobile + `) AND create_platform = 4`
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+	sliceMobile := strings.Split(mobile, ",")
+	var mobiles []string
+	for _, v := range sliceMobile {
+		mobiles = append(mobiles, v)
+	}
+	o := orm.NewOrm()
+	lenarr := len(mobiles)
+	if lenarr == 0 {
+		return
+	}
+	var condition string
+	var pars []interface{}
+	condition = ` AND u.cygx_bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, mobiles)
+	sql := `SELECT
+			u.open_id,
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_user_record AS u 
+		WHERE
+			1 = 1  ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }
 
 // 获取该用户第一个的 三方信息（微信头像信息）
 func GetUserThirdRecordByUserId(userId int) (item *UserRecord, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM user_record WHERE user_id = ? order by user_record_id asc`
-	err = orm.NewOrm().Raw(sql, userId).QueryRow(&item)
+	err = o.Raw(sql, userId).QueryRow(&item)
 	return
 }
 
 // 根据openid绑定用户关系
 func BindUserRecordByOpenid(userId int, openId, bindAccount string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	msql := " UPDATE user_record SET user_id = ?,bind_account=? WHERE open_id = ? "
 	_, err = o.Raw(msql, userId, bindAccount, openId).Exec()
 	return
@@ -103,39 +115,29 @@ func BindUserRecordByOpenid(userId int, openId, bindAccount string) (err error)
 
 // 修改用户微信信息
 func ModifyUserRecordByDetail(openId, unionId, nickName, headimgUrl, city, province, country string, sex, userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE user_record SET union_id=?, nick_name=?,headimgurl=?,sex=?,city=?,province=?,country=? WHERE user_id=? and open_id=? `
 	_, err = o.Raw(sql, unionId, nickName, headimgUrl, sex, city, province, country, userId, openId).Exec()
 	return
 }
 
-// 修改用户微信信息
-func ModifyUserRecordSessionKey(openId, sessionKey string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE user_record SET session_key=? WHERE open_id=? `
-	_, err = o.Raw(sql, sessionKey, openId).Exec()
-	return
-}
-
-// 根据手机号获取用户的openid
-func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenIdList, err error) {
-	var sql string
-	sql = `SELECT cr.open_id,user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE create_platform=? AND bind_account IN (` + bindAccount + `)`
-	_, err = orm.NewOrm().Raw(sql, platform).QueryRows(&items)
-	return
-}
-
 func GetWxOpenIdByMobileSliceList(mobiles []string) (items []*OpenIdList, err error) {
-	itemsLen := len(mobiles)
-	if itemsLen == 0 {
+	o := orm.NewOrm()
+	lenarr := len(mobiles)
+	if lenarr == 0 {
 		return
 	}
-	o := orm.NewOrm()
-	sql := `SELECT cr.*,user_id FROM user_record  as c
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = c.union_id
-			WHERE bind_account IN (` + utils.GetOrmInReplace(itemsLen) + `) AND create_platform = 4`
-	_, err = o.Raw(sql, mobiles).QueryRows(&items)
+	var condition string
+	var pars []interface{}
+	condition = ` AND u.cygx_bind_account IN (` + utils.GetOrmInReplace(lenarr) + `)`
+	pars = append(pars, mobiles)
+	sql := `SELECT
+			u.open_id,
+			u.cygx_user_id AS user_id 
+		FROM
+			cygx_user_record AS u 
+		WHERE
+			1 = 1  ` + condition
+	_, err = o.Raw(sql, pars).QueryRows(&items)
 	return
 }

models/user_template_record.go

@@ -15,9 +15,9 @@ type UserTemplateRecord struct {
 	SendType   int
 }
 
-//添加banner
+// 添加banner
 func AddUserTemplateRecord(item *UserTemplateRecord) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	_, err = o.Insert(item)
 	return
 }

models/wechat.go

@@ -59,7 +59,7 @@ type WxUsers struct {
 }
 
 func GetWxAccessToken() (accessTokenStr string, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM wx_token LIMIT 1`
 	wxToken := new(WxToken)
 	err = o.Raw(sql).QueryRow(&wxToken)
@@ -148,7 +148,7 @@ func GetWxAccessTokenByXzs() (accessTokenStr string, err error) {
 	return
 }
 
-//获取小助手的微信Token
+// 获取小助手的微信Token
 func GetWxTokenByXzs() (item *WxAccessToken, err error) {
 	getUrl := "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + utils.WxPublicAppId + "&secret=" + utils.WxPublicAppSecret
 	result, err := http.Get(getUrl)

models/wx_user.go

@@ -82,18 +82,20 @@ type WxUserItem struct {
 }
 
 func GetWxUserItemByUserId(userId int) (item *WxUserItem, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT a.*,b.company_name FROM wx_user AS a
 			LEFT JOIN company AS b on a.company_id=b.company_id
 			WHERE a.user_id=? `
-	err = orm.NewOrm().Raw(sql, userId).QueryRow(&item)
+	err = o.Raw(sql, userId).QueryRow(&item)
 	return
 }
 
 func GetWxUserItemByMobile(mobile string) (item *WxUserItem, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT a.*,b.company_name FROM wx_user AS a
 			LEFT JOIN company AS b on a.company_id=b.company_id
 			WHERE a.mobile=? `
-	err = orm.NewOrm().Raw(sql, mobile).QueryRow(&item)
+	err = o.Raw(sql, mobile).QueryRow(&item)
 	return
 }
 
@@ -118,37 +120,19 @@ type WxGetUserInfoReq struct {
 }
 
 func GetWxUserItemByUserUnionId(unionId string) (item *WxUserItem, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT a.*,r.headimgurl as headimgurl_record, b.company_name FROM wx_user AS a
 			INNER JOIN company AS b on a.company_id=b.company_id
 			INNER JOIN user_record  as  r ON r.user_id = a.user_id 
 			WHERE r.union_id=?
 			GROUP BY a.user_id`
-	err = orm.NewOrm().Raw(sql, unionId).QueryRow(&item)
-	return
-}
-
-// 根据用户UnionId取相关信息
-func GetWxUserAouthByUnionId(UnionId string) (item *WxUserItem, err error) {
-	sql := `SELECT
-			a.*,
-			s.union_id,
-			b.company_name 
-		FROM
-			cygx_xzs_session  AS s
-			INNER JOIN  user_record as  r ON r.union_id = s.union_id 
-			LEFT JOIN wx_user AS a ON a.mobile = r.bind_account
-			LEFT JOIN company AS b ON a.company_id = b.company_id 
-		WHERE
-			s.union_id = ?
-		ORDER BY
-			a.company_id DESC 
-			LIMIT 1`
-	err = orm.NewOrm().Raw(sql, UnionId).QueryRow(&item)
+	err = o.Raw(sql, unionId).QueryRow(&item)
 	return
 }
 
 // 根据用户手机号获取相关信息
 func GetWxUserItemByUserMobile(mobile string) (item *WxUserItem, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT
 			a.user_id,
 			a.real_name,
@@ -156,25 +140,26 @@ func GetWxUserItemByUserMobile(mobile string) (item *WxUserItem, err error) {
 			a.company_id,
 			a.mobile,
 			a.email,
-			c.union_id,
-			c.open_id,
+			r.union_id,
+			r.open_id,
 			b.company_name 
 		FROM
 			wx_user AS a
 			INNER JOIN company AS b ON a.company_id = b.company_id
 			INNER JOIN user_record AS r ON r.bind_account = a.mobile
-			INNER JOIN cygx_user_record AS c ON c.union_id = r.union_id 
+
 		WHERE
 			a.mobile = ? 
+			and	 r.create_platform = 4
 		GROUP BY
 			a.mobile `
-	err = orm.NewOrm().Raw(sql, mobile).QueryRow(&item)
+	err = o.Raw(sql, mobile).QueryRow(&item)
 	return
 }
 
 // GetUserCountByMobile 获取数量
 func GetUserCountByMobile(mobile string) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sqlCount := ` SELECT COUNT(1) AS count  FROM wx_user WHERE mobile = ? `
 	err = o.Raw(sqlCount, mobile).QueryRow(&count)
 	return
@@ -182,14 +167,14 @@ func GetUserCountByMobile(mobile string) (count int, err error) {
 
 // 添加用户信息
 func AddWxUser(item *WxUser) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	lastId, err = o.Insert(item)
 	return
 }
 
 // 变更联系人是否已注册状态
 func ModifyWxUserRegisterStatus(userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `UPDATE wx_user SET is_register=?,source=3,register_time=NOW() WHERE user_id = ? `
 	_, err = o.Raw(sql, 1, userId).Exec()
 	return
@@ -203,8 +188,9 @@ func GetUserRemind(uid int) (count int, err error) {
 }
 
 func ModifyReportLastViewTime(uid int) (err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := ` UPDATE wx_user SET report_last_view_time=NOW()
 			WHERE user_id=? `
-	_, err = orm.NewOrm().Raw(sql, uid).Exec()
+	_, err = o.Raw(sql, uid).Exec()
 	return
 }

models/wx_user_code.go

@@ -16,15 +16,15 @@ type WxUserCode struct {
 	CreateTime     time.Time
 }
 
-//添加联系人日志信息
+// 添加联系人日志信息
 func AddWxUserCode(item *WxUserCode) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetWxUserCode(wxCode string) (item *WxUserCode, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly_report")
 	sql := `SELECT * FROM wx_user_code WHERE wx_code=? `
 	err = o.Raw(sql, wxCode).QueryRow(&item)
 	return

services/activity.go

@@ -1696,7 +1696,7 @@ func ActivityUserRemind(user *models.WxUserItem, activityDetail *models.Activity
 		sourceMsg = "活动报名"
 	}
 
-	openIdList, e := models.GetUserRecordListByMobile(4, sellerItemQy.Mobile)
+	openIdList, e := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
 	if e != nil {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error())
 		return err

services/article.go

@@ -683,7 +683,7 @@ func ArticleUserRemind(user *models.WxUserItem, articleDetail *models.ArticleDet
 		return err
 	}
 	if sellerItemQy != nil {
-		openIdList, err := models.GetUserRecordListByMobile(4, sellerItemQy.Mobile)
+		openIdList, err := models.GetWxOpenIdByMobileList(sellerItemQy.Mobile)
 		if err != nil {
 			return err
 		}

services/user.go

@@ -576,7 +576,7 @@ func SendPermissionApplyTemplateMsgAdmin(req models.ApplyTryReq, usermobile, app
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue)
+	openIdList, e := models.GetWxOpenIdByMobileList(cnf.ConfigValue)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return err

services/wx_template_msg.go

@@ -422,7 +422,7 @@ func SendActivitieCancelSignTemplateMsg(user *models.WxUserItem, activityDetail
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile)
+	openIdList, e := models.GetWxOpenIdByMobileList(cnf.ConfigValue + "," + sellerItemQy.Mobile)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return
@@ -467,7 +467,7 @@ func SendNeiRongZuActivitieSignTemplateMsg(user *models.WxUserItem, activityDeta
 		err = errors.New("GetConfigByCode, Err: " + e.Error() + configCode)
 		return
 	}
-	openIdList, e := models.GetUserRecordListByMobile(4, cnf.ConfigValue+","+sellerItemQy.Mobile)
+	openIdList, e := models.GetWxOpenIdByMobileList(cnf.ConfigValue + "," + sellerItemQy.Mobile)
 	if e != nil && e.Error() != utils.ErrNoRow() {
 		err = errors.New("GetUserRecordListByMobile, Err: " + e.Error() + cnf.ConfigValue)
 		return err

utils/config.go

@@ -9,6 +9,7 @@ import (
 var (
 	RunMode           string //运行模式
 	MYSQL_URL         string //数据库连接
+	MYSQL_URL_CYGX    string //查研观向数据库连接
 	MYSQL_URL_RDDP    string //数据库连接
 	MYSQL_URL_TACTICS string
 
@@ -81,6 +82,7 @@ func init() {
 	}
 	fmt.Println(RunMode + " 模式")
 	MYSQL_URL = config["mysql_url"]
+	MYSQL_URL_CYGX = config["mysql_url_cygx"]
 	MYSQL_URL_RDDP = config["mysql_url_rddp"]
 
 	REDIS_CACHE = config["beego_cache"]