fix：整理代码，将一些链接到weekly库

models/aimod/ai.go

@@ -35,7 +35,7 @@ type ChatReq struct {
 
 func GetAiChatByAsk(askUuid, model string) (item *AiChat, err error) {
 	sql := `SELECT * FROM ai_chat WHERE ask_uuid=? AND model =? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	err = o.Raw(sql, askUuid, model).QueryRow(&item)
 	return
 }
@@ -49,14 +49,14 @@ type ChatResp struct {
 
 // AddAiChatTopic 新增主题
 func AddAiChatTopic(item *AiChatTopic) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	lastId, err = o.Insert(item)
 	return
 }
 
 // AddAiChat 新增聊天
 func AddAiChat(item *AiChat) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	lastId, err = o.Insert(item)
 	return
 }
@@ -70,7 +70,7 @@ type AiChatTopicView struct {
 
 func GetAiChatTopicList(sysUserId int) (item []*AiChatTopicView, err error) {
 	sql := ` SELECT * FROM ai_chat_topic WHERE sys_user_id=? ORDER BY create_time DESC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Raw(sql, sysUserId).QueryRows(&item)
 	return
 }
@@ -91,7 +91,7 @@ type AiChatView struct {
 
 func GetAiChatList(aiChatTopicId int) (item []*AiChatView, err error) {
 	sql := ` SELECT * FROM ai_chat WHERE ai_chat_topic_id=? ORDER BY create_time ASC `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Raw(sql, aiChatTopicId).QueryRows(&item)
 	return
 }
@@ -105,7 +105,7 @@ type TopicDeleteReq struct {
 }
 
 func DeleteTopic(topicId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	tx, err := o.Begin()
 	defer func() {
 		if err != nil {
@@ -134,13 +134,13 @@ type TopicEditReq struct {
 
 func GetAiChatTopicByTopicName(topicName string) (item *AiChatTopicView, err error) {
 	sql := ` SELECT * FROM ai_chat_topic WHERE topic_name=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	err = o.Raw(sql, topicName).QueryRow(&item)
 	return
 }
 
 func EditTopic(topicId int, topicName string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` UPDATE ai_chat_topic SET topic_name=? WHERE  ai_chat_topic_id=? `
 	_, err = o.Raw(sql, topicName, topicId).Exec()
 	return err

models/chart_permission.go

@@ -28,80 +28,16 @@ type ChartPermission struct {
 	PriceDrivenState    int       `description:"品种价格驱动开启状态 0-关闭 1-开启"`
 }
 
-// GetChartPermissionById 主键获取权限
-func GetChartPermissionById(permissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ? LIMIT 1`
-	err = o.Raw(sql, permissionId).QueryRow(&item)
-	return
-}
-
 // Update 更新
 func (chartPermissionInfo *ChartPermission) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(chartPermissionInfo, cols...)
 	return
 }
 
-// YbChartPermissionFirst 研报一级品种分类
-type YbChartPermissionFirst struct {
-	Id           int
-	ClassifyName string `description:"权限一级分类名称，与chart_permission的classify_name一致"`
-	YbIndexShow  int    `description:"是否展示在研报小程序首页页面  1-展示；0-不展示"`
-	YbIndexName  string `description:"研报小程序首页简称"`
-	YbIndexSort  string `description:"研报小程序首页排序"`
-	YbIndexIcon  string `description:"研报小程序首页图标地址"`
-}
-
-// GetPermissionByProductIdAndClassifyName 获取子分类
-func GetPermissionByProductIdAndClassifyName(productId int, classifyName string) (items []*ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE enabled = 1 AND product_id = ? AND classify_name = ? AND permission_type = 0 ORDER BY sort ASC`
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	return
-}
-
-// GetChartPermissionById 主键获取权限
-func GetChartPermissionByRemark(remark string) (item *ChartPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE remark = ? LIMIT 1`
-	err = o.Raw(sql, remark).QueryRow(&item)
-	return
-}
-
-// GetChartPermissionByIds 主键获取权限
-func GetChartPermissionByIds(permissionIds []string) (list []*ChartPermission, err error) {
-	qb, _ := orm.NewQueryBuilder("mysql")
-	// 构建查询对象
-	qb.Select("*").From("chart_permission").
-		Where("chart_permission_id").In(permissionIds...)
-	// 导出 SQL 语句
-	sql := qb.String()
-
-	// 执行 SQL 语句
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-// GetChartPermissionByIds 主键获取权限
-func GetChartPermissionByNames(permissionNames []string) (list []*ChartPermission, err error) {
-	qb, _ := orm.NewQueryBuilder("mysql")
-	// 构建查询对象
-	qb.Select("*").From("chart_permission").
-		Where("chart_permission_name").In(permissionNames...)
-	// 导出 SQL 语句
-	sql := qb.String()
-
-	// 执行 SQL 语句
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
 // GetChartPermissionList 获取品种权限列表
 func GetChartPermissionList() (list []*ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM chart_permission ORDER BY product_id ASC, sort ASC`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return

models/classify.go

@@ -386,22 +386,3 @@ type RelateTelSecClassifyWithPermissions struct {
 	ClassifyName       string `description:"分类名称"`
 	ChartPermissionIds string `description:"权限IDs"`
 }
-
-// GetSecondaryClassifyChartPermissions 获取二级分类的权限
-func GetSecondaryClassifyChartPermissions(classifyNames []string) (items []*RelateTelSecClassifyWithPermissions, err error) {
-	if len(classifyNames) == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				b.key_word AS classify_name,
-				GROUP_CONCAT(b.chart_permission_id) AS chart_permission_ids
-			FROM
-				chart_permission_search_key_word_mapping AS b
-			WHERE
-				b.key_word IN (` + utils.GetOrmInReplace(len(classifyNames)) + `) AND b.from = 'rddp'
-			GROUP BY
-				b.key_word`
-	_, err = o.Raw(sql, classifyNames).QueryRows(&items)
-	return
-}

models/company/company_approval_message.go

@@ -1,180 +0,0 @@
-package company
-
-import (
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-type CompanyApprovalMessage struct {
-	Id                int       `orm:"column(id);pk"`
-	CreateUserId      int       `description:"申请者id"`
-	ReceiveUserId     int       `description:"审批者id"`
-	MessageStatus     int       `description:"消息状态:0未读，1:已读"`
-	SourceType        int       `description:"消息来源类型，1:客户，2：合同，3：用印"`
-	Remark            string    `description:"备注信息"`
-	Content           string    `description:"消息内容"`
-	CompanyId         int       `description:"客户id"`
-	CompanyName       string    `description:"客户名称"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"修改时间"`
-	CompanyApprovalId int       `description:"审批单id"`
-	ApprovalStatus    int       `description:"审批状态：1:待审批，2:已审批，3:已驳回"`
-	OperationStatus   int       `description:"消息状态:1:待审批，2:已审批"`
-	MessageType       int       `description:"1:申请消息，2:审批结果，3：文字消息"`
-	MessageInfo       string    `description:"消息主要内容，json数据"`
-}
-
-// 添加审批消息
-func AddCompanyApprovalMessage(item *CompanyApprovalMessage) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
-	return
-}
-
-// GetCompanyApprovalMessageById 主键获取消息
-func GetCompanyApprovalMessageById(id int) (item *CompanyApprovalMessage, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_approval_message WHERE id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&item)
-	return
-}
-
-type CompanyApprovalMessageList struct {
-	Id                int    `orm:"column(id);pk"`
-	MessageStatus     int    `description:"消息状态:0未读，1:已读，2：作废"`
-	SourceType        int    `description:"消息来源类型，1:客户，2：合同 3：用印"`
-	Remark            string `description:"备注信息"`
-	Content           string `description:"消息内容"`
-	CompanyName       string `description:"客户名称"`
-	CreateTime        string `description:"创建时间"`
-	RealName          string `description:"销售名称"`
-	CompanyApprovalId int    `description:"审批单id"`
-	ApprovalStatus    int    `description:"审批状态：1:待审批，2:已审批，3:已驳回"`
-}
-
-type CompanyApprovalMessageListResp struct {
-	List  []*CompanyApprovalMessageList
-	Total int `description:"总数据条数"`
-}
-
-// 待办消息列表
-type CompanyApprovalMessageListV2Resp struct {
-	Company      CompanyApprovalMessageListResp  `description:"客户"`
-	Contract     CompanyApprovalMessageListResp  `description:"合同"`
-	Seal         CompanyApprovalMessageListResp  `description:"用印"`
-	EdbReplace   CompanyApprovalMessageListResp  `description:"指标替换"`
-	ETATrial     ETATrialApprovalMessageListResp `description:"ETA试用"`
-	BusinessTrip CompanyApprovalMessageListResp  `description:"出差"`
-}
-
-type ETATrialApprovalMessageListResp struct {
-	List  []*ETATrialApprovalMessageList
-	Total int `description:"总数据条数"`
-}
-
-type ETATrialApprovalMessageList struct {
-	Id            int    `orm:"column(id);pk"`
-	MessageStatus int    `description:"消息状态:0未读，1:已读，2：作废"`
-	SourceType    int    `description:"消息来源类型，1:客户，2：合同 3：用印 4：指标替换 5：ETA试用"`
-	Remark        string `description:"备注信息"`
-	Content       string `description:"消息内容"`
-	CompanyName   string `description:"客户名称"`
-	CreateTime    string `description:"创建时间"`
-	RealName      string `description:"销售名称"`
-	Redirect      int    `description:"跳转路径 1用户列表 2审批列表"`
-}
-
-func GetCompanyApprovalMessageList(sysUserId int, startTime string) (items []*CompanyApprovalMessageList, err error) {
-	sql := `SELECT a.*,b.real_name FROM company_approval_message AS a
-			INNER JOIN admin AS b ON a.create_user_id=b.admin_id
-			WHERE receive_user_id=? AND a.operation_status=1 AND message_status !=2 `
-	if startTime != "" {
-		sql += ` AND create_time>='` + startTime + `'`
-	}
-	sql += ` ORDER BY create_time DESC `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, sysUserId).QueryRows(&items)
-	return
-}
-
-func GetCompanyApprovalMessageCount(sysUserId int, startTime string) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM company_approval_message AS a
-			INNER JOIN admin AS b ON a.create_user_id=b.admin_id
-			WHERE receive_user_id=? AND a.operation_status=1 AND message_status !=2 `
-	if startTime != "" {
-		sql += ` AND create_time>='` + startTime + `'`
-	}
-	o := orm.NewOrm()
-	err = o.Raw(sql, sysUserId).QueryRow(&count)
-	return
-}
-
-// 修改消息信息
-func ModifyCompanyApprovalMessage(companyApprovalId, sourceType int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE company_approval_message SET operation_status=2,modify_time=NOW() 
-WHERE company_approval_id=? AND source_type=?  AND message_type=1 AND operation_status=1 `
-	_, err = o.Raw(sql, companyApprovalId, sourceType).Exec()
-	return
-}
-
-// 申请服务更新请求参数
-type CompanyApprovalMessageReadReq struct {
-	Id int `description:"消息id"`
-}
-
-func ModifyCompanyApprovalMessageStatus(companyApprovalMessageId int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE company_approval_message SET message_status=1,modify_time=NOW() WHERE id=?`
-	_, err = o.Raw(sql, companyApprovalMessageId).Exec()
-	return
-}
-
-// 消息作废
-func CancelCompanyApprovalMessage(companyApprovalId, sourceType int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE company_approval_message SET message_status=2,modify_time=NOW() 
-WHERE company_approval_id=? AND source_type=?  AND message_type=1 AND operation_status=1 `
-	//sql := `UPDATE company_approval_message SET message_status=1,modify_time=NOW() WHERE id=?`
-	_, err = o.Raw(sql, companyApprovalId, sourceType).Exec()
-	return
-}
-func GetAdminCompanyApprovalMessageList(startTime string) (items []*CompanyApprovalMessageList, err error) {
-	sql := `SELECT a.*,b.real_name FROM company_approval_message AS a
-			INNER JOIN admin AS b ON a.create_user_id=b.admin_id
-			WHERE receive_user_id = -1 AND a.operation_status=1 AND message_status !=2 `
-	if startTime != "" {
-		sql += ` AND create_time>='` + startTime + `'`
-	}
-	sql += ` ORDER BY create_time DESC `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// 消息删除
-func DeleteCompanyApprovalMessage(companyApprovalId, sourceType int) (err error) {
-	o := orm.NewOrm()
-	sql := `DELETE FROM company_approval_message WHERE company_approval_id=? AND source_type=? `
-	_, err = o.Raw(sql, companyApprovalId, sourceType).Exec()
-	return
-}
-
-// CancelCompanyApprovalMessage 消息作废
-func IsReadCompanyApprovalMessage(companyApprovalId, sourceType int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE company_approval_message SET message_status=1,modify_time=NOW() 
-WHERE company_approval_id=? AND source_type=?  AND message_type=1 AND operation_status=1 `
-	_, err = o.Raw(sql, companyApprovalId, sourceType).Exec()
-	return
-}
-
-// ModifyCompanyApprovalMessageStatusByCond 条件修改已读状态
-func ModifyCompanyApprovalMessageStatusByCond(cond string, pars []interface{}) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE company_approval_message SET message_status = 1, modify_time = NOW() WHERE 1 = 1 %s`
-	sql = fmt.Sprintf(sql, cond)
-	_, err = o.Raw(sql, pars).Exec()
-	return
-}

models/company/company_industry.go

@@ -1,48 +0,0 @@
-package company
-
-import "github.com/beego/beego/v2/client/orm"
-
-type CompanyIndustry struct {
-	IndustryId   int    `description:"行业id"`
-	IndustryName string `description:"行业名称"`
-	ParentId     int    `description:"父级id"`
-	Classify     string `description:"分类"`
-}
-
-type CompanyIndustryItem struct {
-	IndustryId   int                       `description:"行业id"`
-	IndustryName string                    `description:"行业名称"`
-	Classify     string                    `description:"分类"`
-	Children     []*CompanyIndustryItemSub `json:"children"`
-}
-
-type CompanyIndustryItemSub struct {
-	IndustryId   int    `description:"行业id"`
-	IndustryName string `description:"行业名称"`
-	Classify     string `description:"分类"`
-}
-
-type CompanyIndustryResp struct {
-	List []*CompanyIndustryItem
-}
-
-func GetCompanyIndustry(productName string) (items []*CompanyIndustryItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_industry WHERE product_name=? AND parent_id=0 ORDER BY industry_id ASC`
-	_, err = o.Raw(sql, productName).QueryRows(&items)
-	return
-}
-
-func GetCompanyIndustryChildren(classify string, parentId int) (items []*CompanyIndustryItemSub, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_industry WHERE product_name=? AND parent_id=? ORDER BY industry_id ASC`
-	_, err = o.Raw(sql, classify, parentId).QueryRows(&items)
-	return
-}
-
-func GetCompanyIndustryById(industryId int) (items *CompanyIndustry, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_industry WHERE industry_id=? `
-	err = o.Raw(sql, industryId).QueryRow(&items)
-	return
-}

models/company/company_log.go

@@ -1,46 +0,0 @@
-package company
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-type CompanyLog struct {
-	Id              int       `orm:"column(id);pk"`
-	CompanyId       int       `description:"客户id"`
-	CompanyName     string    `description:"客户名称"`
-	CreditCode      string    `description:"统一社会信用码"`
-	CompanyCode     string    `description:"客户编码"`
-	Sort            int       `description:"优先级"`
-	IsFeeCustomer   int       `description:"是否付费用户"`
-	Country         string    `description:"国家编码"`
-	ProvinceId      int       `description:"省id"`
-	CityId          int       `description:"市id"`
-	Address         string    `description:"详细地址"`
-	Ctype           int       `orm:"column(type)" description:"客户标签,1：付费客户，2：试用客户，3：流失客户，4：潜在客户" `
-	Enabled         int       `description:"用户状态"`
-	CreatedTime     time.Time `description:"创建时间"`
-	LastUpdatedTime time.Time `description:"最后修改时间"`
-	Seller          string    `description:"销售员"`
-	SellsId         int       `description:"销售员ID"`
-	CompanyBelong   string    `description:"客户所属，ficc：ficc客户，public_offering：公募客户，partner：合作伙伴"`
-	StartDate       string    `description:"合同开始日期"`
-	EndDate         string    `description:"合同结束日期"`
-	LoseReason      string    `description:"流失原因"`
-	LastType        int       `description:"原客户标签"`
-	FirstStartDate  string    `description:"首次设置为试用客户开始时间"`
-	FirstEndDate    string    `description:"首次设置为试用客户结束时间"`
-	DateType        int       `description:"日期类型"`
-	AdminId         int       `description:"操作人id"`
-	LogType         string    `description:"日志类型"`
-	LogCreateTime   time.Time `description:"日志创建时间"`
-	Province        string    `description:"省"`
-	City            string    `description:"市"`
-}
-
-//新增客户产品
-func AddCompanyLog(item *CompanyLog) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
-	return
-}

models/company/company_operation_record.go

@@ -1,90 +0,0 @@
-package company
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-type CompanyOperationRecord struct {
-	Id                  int       `orm:"column(id);pk"`
-	CompanyId           int       `description:"客户id"`
-	CompanyName         string    `description:"客户名称"`
-	SellerId            int       `description:"销售员id"`
-	SysUserId           int       `description:"操作者id"`
-	SysRealName         string    `description:"操作者名称"`
-	Remark              string    `description:"备注"`
-	Operation           string    `description:"操作"`
-	CreateTime          time.Time `description:"操作时间"`
-	ProductId           int       `description:"产品id"`
-	ProductName         string    `description:"产品名称"`
-	ApproveUserId       int       `description:"审批人id"`
-	ApproveRealName     string    `description:"审批人姓名"`
-	ApproveContent      string    `description:"审批人内容"`
-	ApproveContentExtra string    `description:"审批人内容补充"`
-	ApproveRemark       string    `description:"审批人内容"`
-	Status              string    `description:"状态"`
-}
-
-type CompanyOperationRecordList struct {
-	Id                  int    `orm:"column(id);pk"`
-	CompanyId           int64  `description:"客户id"`
-	CompanyName         string `description:"客户名称"`
-	SysUserId           int    `description:"操作者id"`
-	SysRealName         string `description:"操作者名称"`
-	Remark              string `description:"备注"`
-	Operation           string `description:"操作"`
-	ApproveContent      string `description:"详情"`
-	ApproveContentExtra string `description:"详情补充"`
-	CreateTime          string `description:"操作时间"`
-	ProductId           int
-	ProductName         string
-}
-
-//新增客户操作记录
-func AddCompanyOperationRecord(item *CompanyOperationRecord) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-func GetCompanyOperationRecordList(companyId int) (items []*CompanyOperationRecordList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_operation_record WHERE company_id=? ORDER BY create_time DESC `
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
-	return
-}
-
-type CompanyOperationRecordListResp struct {
-	List       []*CompanyOperationRecordList
-	ShowButton bool
-}
-
-//获取客户正式转试用的次数
-func GetCompanyProductOperationRecordCount(companyId, productId int) (total int64, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT count(1) ct FROM company_operation_record 
-WHERE company_id=? AND product_id=? and operation="try_out" `
-	err = o.Raw(sql, companyId, productId).QueryRow(&total)
-	return
-}
-
-func UpdateCompanyOperationRecord(item *CompanyOperationRecord) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Update(item, "approve_content", "approve_content_extra")
-	return
-}
-
-func ReadCompanyOperationRecord(companyId int) (items []*CompanyOperationRecord, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_operation_record WHERE company_id=? AND operation='try_out' ORDER BY create_time DESC `
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
-	return
-}
-
-// GetTryOutCompanyOperationRecordList 获取客户正式转试用变更的操作记录
-func GetTryOutCompanyOperationRecordList() (list []*CompanyOperationRecord, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_operation_record where operation="try_out";`
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}

models/company/company_permission.go

@@ -54,96 +54,13 @@ type PermissionSetResp struct {
 	ListType []*PermissionSetListType `description:"主观客观列表"`
 }
 
-type ChartPermissionFirst struct {
-	ClassifyName string `description:"分类"`
-}
-
 func GetPermissionSetItems(productId int, classifyName string) (items []*PermissionSetItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type=0 ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
 
-func GetPermissionSetItemsByType(productId int, classifyName string) (items []*PermissionSetItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type!=2 ORDER BY sort ASC `
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	return
-}
-
-func GetPermissionSetSandoItems(productId int, classifyName string) (items []*PermissionLookItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  ORDER BY sort ASC `
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	return
-}
-
-func GetPermissionSetItemsType(productId int, classifyName string) (items []*PermissionLookItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=?  AND permission_type!=0 ORDER BY sort ASC `
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	return
-}
-
-type CompanyReportPermission struct {
-	CompanyReportPermissionId int64 `orm:"column(company_report_permission_id);pk"`
-	CompanyId                 int
-	ReportPermissionId        int
-	CreatedTime               time.Time
-	LastUpdatedTime           time.Time
-	ChartPermissionId         int
-	StartDate                 string    `description:"权限开始日期"`
-	EndDate                   string    `description:"权限结束日期"`
-	ProductId                 int       `description:"产品id"`
-	ProductName               string    `description:"产品名称"`
-	CompanyContractId         int       `description:"合同id"`
-	Status                    string    `description:"'正式','试用','关闭'"`
-	ModifyTime                time.Time `description:"修改时间"`
-	IsUpgrade                 int       `description:"是否升级，1是，0否"`
-	ExpensiveYx               int       `description:"权益研选: 0-3w; 1-5w"`
-}
-
-// 新增客户权限
-func AddCompanyReportPermission(item *CompanyReportPermission) (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	item.CompanyReportPermissionId = lastId
-	return
-}
-
-func GetCompanyReportPermissionCount(companyId, productId int) (count int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT COUNT(1) AS count FROM company_report_permission WHERE company_id=? AND product_id=? `
-	err = o.Raw(sql, companyId, productId).QueryRow(&count)
-	return
-}
-
-func DeleteCompanyReportPermission(companyId, productId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM company_report_permission WHERE company_id=? AND product_id=? `
-	_, err = o.Raw(sql, companyId, productId).Exec()
-	return
-}
-
-type PermissionLookResp struct {
-	List    []*PermissionLookList
-	ListRai []*PermissionLookList `description:"权益"`
-}
-
-type PermissionLookSandoResp struct {
-	List     []*PermissionLookList
-	ListType []*PermissionSetListType `description:"主观客观列表"`
-}
-
-type PermissionLookList struct {
-	ClassifyName string `description:"分类"`
-	Items        []*PermissionLookItem
-	ItemsType    []*PermissionSetItemType `description:"主观客观列表"`
-	CheckList    []int
-	RaiMerge     int `description:"权益-用于前端判断展示形式：1-全部合并 2-全部拆分"`
-}
-
 type PermissionLookItem struct {
 	ChartPermissionId  int                   `description:"权限id"`
 	PermissionName     string                `description:"权限名称"`
@@ -162,54 +79,6 @@ type PermissionLookItem struct {
 	Child              []*PermissionLookItem `description:"子权限"`
 }
 
-func GetPermissionLookItems(productId int, classifyName string) (items []*PermissionLookItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? ORDER BY sort ASC `
-	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
-	return
-}
-
-func GetCompanyPermissionCheck(companyId, permissionId int) (count int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT COUNT(1) AS count FROM company_report_permission AS a WHERE a.company_id=? AND a.chart_permission_id=? `
-	err = o.Raw(sql, companyId, permissionId).QueryRow(&count)
-	return
-}
-
-// GetCompanyPermission 根据客户id和品种id获取对应的数据
-func GetCompanyPermission(companyId, permissionId int) (item *CompanyReportPermission, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_report_permission AS a WHERE a.company_id=? AND a.chart_permission_id=? `
-	err = o.Raw(sql, companyId, permissionId).QueryRow(&item)
-	return
-}
-
-func GetCompanyPermissionCheckItem(companyId, permissionId int) (item *PermissionLookItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_report_permission AS a WHERE a.company_id=? AND a.chart_permission_id=? `
-	err = o.Raw(sql, companyId, permissionId).QueryRow(&item)
-	return
-}
-
-// 通过主观ID获取对应的客观ID
-func GetPermissionIdById(permissionIds string) (allpermissionId string, err error) {
-	sql := ` SELECT
-				GROUP_CONCAT( DISTINCT chart_permission_id  SEPARATOR ',' ) AS permission 
-			FROM
-				chart_permission 
-			WHERE
-				product_permission_name IN (
-				SELECT
-					product_permission_name 
-				FROM
-					chart_permission 
-			WHERE
-				chart_permission_id IN ( ` + permissionIds + ` )) `
-	o := orm.NewOrm()
-	err = o.Raw(sql).QueryRow(&allpermissionId)
-	return
-}
-
 type PermissionVarietyResp struct {
 	List []*PermissionVarietyList
 }
@@ -226,93 +95,20 @@ type PermissionVarietyList struct {
 }
 
 func GetPermissionVarietyItems(productId int, classifyName string) (items []*PermissionVarietyItem, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND product_id=? AND classify_name=? GROUP BY permission_name ORDER BY sort ASC `
 	_, err = o.Raw(sql, productId, classifyName).QueryRows(&items)
 	return
 }
 
-type PermissionCompany struct {
-	CompanyId int
-}
-
-//
-//func GetCompanyListCompanyIdByPermissionIdStr(permissionStr string, permissionCount int) (items []*PermissionCompany, err error) {
-//	o := orm.NewOrm()
-//	sql := `
-//		SELECT company_id, COUNT(company_id) ks
-//		  FROM company_report_permission
-//		 WHERE report_permission_id IN (` + permissionStr + `)
-//
-//		 GROUP BY company_id
-//		HAVING company_id IN
-//
-//		 (SELECT company_id
-//			FROM company_report_permission
-//		   GROUP BY company_id
-//		  HAVING COUNT(company_id) = ?)
-//
-//		AND COUNT(company_id) = ?
-//`
-//	_, err = o.Raw(sql, permissionCount, permissionCount).QueryRows(&items)
-//	return
-//}
-
-func GetCompanyListCompanyIdByPermissionIdStr(permissionStr string) (company_id string, err error) {
-	o := orm.NewOrm()
-	sql := `
-		SELECT 
-		GROUP_CONCAT(DISTINCT company_id) AS company_id
-		FROM company_report_permission
-		WHERE report_permission_id IN (?)
-		#GROUP  BY company_id
-		`
-	err = o.Raw(sql, permissionStr).QueryRow(&company_id)
-	return
-}
-
-func GetPermissionNameByPermissionIdStr(permissionStr string) (chart_permission_name string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT 	GROUP_CONCAT(DISTINCT chart_permission_name SEPARATOR ',') AS chart_permission_name FROM chart_permission WHERE chart_permission_id IN (` + permissionStr + `)`
-	err = o.Raw(sql).QueryRow(&chart_permission_name)
-	return
-}
-
-func GetPermissionIdsByPermissionNameStr(chartPermissionName string) (chart_permission_id string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT  GROUP_CONCAT(DISTINCT chart_permission_id  SEPARATOR ',') AS chart_permission_id 	FROM chart_permission WHERE chart_permission_name IN(` + chartPermissionName + `)`
-	err = o.Raw(sql).QueryRow(&chart_permission_id)
-	return
-}
-
-// 新增试用权限
-type PermissionAddTryOutReq struct {
-	CompanyId         int    `description:"客户id"`
-	ChartPermissionId string `description:"权限id,多个用英文逗号隔开"`
-}
-
 // GetChartPermissionListById 根据权限id获取产品权限详情
 func GetChartPermissionListById(chartPermissionId int) (item *ChartPermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM chart_permission WHERE chart_permission_id =? `
 	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
 	return
 }
 
-func GetPermissionLookItemsSandO(permissionIds string) (items []*PermissionLookItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1 AND chart_permission_id IN (` + permissionIds + `) ORDER BY sort ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetPermissionLookItemsSandOByName(permissionName string) (items []*PermissionLookItem, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission WHERE enabled=1  AND product_id = 2 AND remark IN (` + permissionName + `) ORDER BY sort ASC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 func GetParentIdFromGroup(gid int) (items *int, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT parent_id FROM sys_group WHERE group_id=? `
@@ -320,13 +116,6 @@ func GetParentIdFromGroup(gid int) (items *int, err error) {
 	return
 }
 
-func GetGroupIdsByParentId(gid int) (items []*string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT group_id FROM sys_group WHERE parent_id=? `
-	_, err = o.Raw(sql, gid).QueryRows(&items)
-	return
-}
-
 func GetGroupNamesById(gid int) (items *string, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT group_name FROM sys_group WHERE group_id=? `

models/company/company_product_try_out_update_log.go

@@ -1,187 +0,0 @@
-package company
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-// CompanyProductTryOutUpdateLog 客户产品试用变更日志表
-type CompanyProductTryOutUpdateLog struct {
-	Id          int       `orm:"column(id);pk"`
-	CompanyId   int       `description:"客户id"`
-	ProductId   int       `description:"产品id"`
-	SellerId    int       `description:"销售id"`
-	SellerName  string    `description:"销售名称"`
-	Source      string    `description:"来源"`
-	StartDate   time.Time `description:"开始日期"`
-	EndDate     time.Time `description:"结束日期"`
-	RealEndDate time.Time `description:"实际结束日期"`
-	IsStop      int       `description:"是否已经终止了，0：进行中；1：已终止"`
-	CreateTime  time.Time `description:"创建时间"`
-}
-
-// Update 更新客户产品试用变更日志
-func (item *CompanyProductTryOutUpdateLog) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
-	return
-}
-
-// CompanyProductTryOutUpdatePermissionLog 客户产品变更品种详情表
-type CompanyProductTryOutUpdatePermissionLog struct {
-	Id                        int       `orm:"column(id);pk"`
-	CompanyProductUpdateLogId int       `description:"产品变更id"`
-	ChartPermissionId         int       `description:"品种权限id"`
-	StartDate                 time.Time `description:"开始日期"`
-	EndDate                   time.Time `description:"结束日期"`
-	RealEndDate               time.Time `description:"实际结束日期"`
-	IsStop                    int       `description:"是否已经终止了，0：进行中；1：已终止"`
-	CreateTime                time.Time `description:"创建时间"`
-}
-
-// Update 更新客户产品变更品种详情
-func (item *CompanyProductTryOutUpdatePermissionLog) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(item, cols...)
-	return
-}
-
-// AddCompanyProductTryOutUpdateLog 新增客户试用产品变更日志
-func AddCompanyProductTryOutUpdateLog(item *CompanyProductTryOutUpdateLog, companyReportPermissionList []*CompanyReportPermission) (err error) {
-	o := orm.NewOrm()
-	lastId, err := o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.Id = int(lastId)
-
-	companyProductUpdatePermissionLogList := make([]*CompanyProductTryOutUpdatePermissionLog, 0)
-	for _, v := range companyReportPermissionList {
-		tmpCompanyProductUpdatePermissionLog := &CompanyProductTryOutUpdatePermissionLog{
-			//Id:                        0,
-			CompanyProductUpdateLogId: item.Id,
-			ChartPermissionId:         v.ChartPermissionId,
-			StartDate:                 item.StartDate,
-			EndDate:                   item.EndDate,
-			RealEndDate:               item.StartDate,
-			IsStop:                    item.IsStop,
-			CreateTime:                item.CreateTime,
-		}
-		companyProductUpdatePermissionLogList = append(companyProductUpdatePermissionLogList, tmpCompanyProductUpdatePermissionLog)
-	}
-
-	if len(companyProductUpdatePermissionLogList) > 0 {
-		_, err = o.InsertMulti(len(companyProductUpdatePermissionLogList), companyProductUpdatePermissionLogList)
-	}
-
-	{
-		// 获取当前正在进行中的客户变更试用的数据
-		findProgress, _ := GetCompanyProductTryOutUpdateLogItem(item.CompanyId, item.ProductId)
-		// 如果没有的话，那么就将试用天数+1
-		if findProgress != nil {
-			sql := `UPDATE  company_product
-			SET
-			  try_out_day_total = try_out_day_total+1
-			WHERE company_id = ? AND product_id = ?`
-			_, err = o.Raw(sql, item.CompanyId, item.ProductId).Exec()
-		}
-	}
-	return
-}
-
-// GetCompanyProductTryOutUpdateLogItem 获取当前正在进行中的客户变更试用的数据
-func GetCompanyProductTryOutUpdateLogItem(companyId, productId int) (item *CompanyProductTryOutUpdateLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_try_out_update_log where company_id=? and product_id=? and is_stop = 0`
-	err = o.Raw(sql, companyId, productId).QueryRow(&item)
-	return
-}
-
-// GetCompanyProductTryOutUpdateGroup 获取当前正在进行中的客户变更试用的数据
-func GetCompanyProductTryOutUpdateGroup() (items []*CompanyProductTryOutUpdateLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_try_out_update_log group by company_id,product_id;`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// GetCompanyProductTryOutUpdateNoStopGroup 获取当前正在进行中的客户变更试用的数据（未停止的）
-func GetCompanyProductTryOutUpdateNoStopGroup() (items []*CompanyProductTryOutUpdateLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_try_out_update_log where is_stop=0 group by company_id,product_id;`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// GetCompanyProductTryOutUpdateList 获取当前正在进行中的客户变更试用的数据
-func GetCompanyProductTryOutUpdateList(companyId, productId int) (items []*CompanyProductTryOutUpdateLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_try_out_update_log Where company_id=? and product_id=? order by create_time asc;`
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-// GetCompanyProductTryOutUpdateNoStopList 获取当前正在进行中的客户变更试用的数据（未停止的）
-func GetCompanyProductTryOutUpdateNoStopList(companyId, productId int) (items []*CompanyProductTryOutUpdateLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_try_out_update_log Where company_id=? and product_id=? AND is_stop=0 order by create_time asc;`
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-// GetCompanyProductTryOutUpdateNoStopListByEndDate 获取当前正在进行中的客户变更试用的数据（未停止的）
-func GetCompanyProductTryOutUpdateNoStopListByEndDate(companyId, productId int) (items []*CompanyProductTryOutUpdateLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_try_out_update_log Where company_id=? and product_id=? AND is_stop=0 order by end_date desc;`
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-// AddCompanyProductUpdatePermissionLog 客户产品变更品种详情日志
-func AddCompanyProductUpdatePermissionLog(item *CompanyProductTryOutUpdatePermissionLog) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-// GetCompanyProductTryOutUpdateLogTotal 获取客户转试用的记录列表
-func GetCompanyProductTryOutUpdateLogTotal(companyId, productId int) (total int, err error) {
-	o := orm.NewOrm()
-	var pars []interface{}
-	sql := `select count(1) total from company_product_try_out_update_log a join company_product b on a.company_id=b.company_id and a.product_id=b.product_id where a.company_id = ? `
-	pars = append(pars, companyId)
-
-	//如果有传入产品id，那么只查询该类型下的产品
-	if productId != 0 {
-		sql += ` and a.product_id = ? `
-		pars = append(pars, productId)
-	}
-	err = o.Raw(sql, pars...).QueryRow(&total)
-	return
-}
-
-// GetCompanyProductTryOutUpdateLogList 获取客户转试用的记录列表
-func GetCompanyProductTryOutUpdateLogList(companyId, productId, startSize, pageSize int) (items []*CompanyProductTryOutUpdateLog, err error) {
-	o := orm.NewOrm()
-	var pars []interface{}
-	sql := `select a.* from company_product_try_out_update_log a join company_product b on a.company_id=b.company_id and a.product_id=b.product_id where a.company_id = ? `
-	pars = append(pars, companyId)
-
-	//如果有传入产品id，那么只查询该类型下的产品
-	if productId != 0 {
-		sql += ` and a.product_id = ? `
-		pars = append(pars, productId)
-	}
-	sql += ` order by a.create_time desc  LIMIT ?,? `
-	pars = append(pars, startSize, pageSize)
-	_, err = o.Raw(sql, pars...).QueryRows(&items)
-	return
-}
-
-// GetCompanyProductTryOutPermissionUpdateNoStopListByEndDate 获取当前正在进行中的客户变更试用品种的数据（未停止的）
-func GetCompanyProductTryOutPermissionUpdateNoStopListByEndDate(companyProductUpdateLogId int) (items []*CompanyProductTryOutUpdatePermissionLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_try_out_update_permission_log Where company_product_update_log_id=? AND is_stop=0 order by end_date desc;`
-	_, err = o.Raw(sql, companyProductUpdateLogId).QueryRows(&items)
-	return
-}

models/company/company_product_update_log.go

@@ -1,77 +0,0 @@
-package company
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-// CompanyProductUpdateLog 客户产品变更日志表
-type CompanyProductUpdateLog struct {
-	Id          int       `orm:"column(id);pk"`
-	CompanyId   int       `description:"客户id"`
-	ProductId   int       `description:"产品id"`
-	Status      string    `description:"变更后的状态"`
-	SellerId    int       `description:"销售id"`
-	SellerName  string    `description:"销售名称"`
-	Source      string    `description:"来源"`
-	IsFormal    int       `description:"是否已经转正式，0是没有转正式，1是已经转过正式"`
-	StartDate   time.Time `description:"开始日期"`
-	EndDate     time.Time `description:"结束日期"`
-	RealEndDate time.Time `description:"实际结束日期"`
-	CreateTime  time.Time `description:"创建时间"`
-}
-
-// AddCompanyProductUpdateLog 新增客户产品变更日志
-func AddCompanyProductUpdateLog(item *CompanyProductUpdateLog) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	if err != nil {
-		return
-	}
-	item.Id = int(lastId)
-	return
-}
-
-type CompanyReportRecordGroup struct {
-	AdminId int `description:"所属销售id"`
-	//AdminName string `description:"所属销售名称"`
-	Num        int    `description:"汇总次数"`
-	CompanyIds string `description:"客户id字符串"`
-}
-
-// GetGroupCompanyReportRecordGroupList 获取销售分组数据
-func GetGroupCompanyReportRecordGroupList(condition string, pars []interface{}) (list []*CompanyReportRecordGroup, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT seller_id as admin_id,count(DISTINCT(company_id)) num,GROUP_CONCAT(DISTINCT company_id SEPARATOR ',') AS company_ids
-				FROM  company_product_update_log 
-				WHERE 1=1  
- `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` GROUP BY seller_id`
-	_, err = o.Raw(sql, pars).QueryRows(&list)
-
-	return
-}
-
-// GetCompanyProductUpdateLogList 获取客户变更试用的数据
-func GetCompanyProductUpdateLogList() (list []*CompanyProductUpdateLog, err error) {
-	o := orm.NewOrm()
-	//add
-	//receive
-	//thaw
-	//apply_receive
-	//delay
-	sql := ` select * from company_product_update_log where source in("add","receive","thaw","apply_receive");`
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-// GetCompanyProductLogItem 获取客户变更试用的数据
-func GetCompanyProductLogItem(companyId, productId int, createTime time.Time) (item *CompanyProductUpdateLog, err error) {
-	o := orm.NewOrm()
-	sql := ` select * from company_product_log where company_id=? and product_id=? and create_time >= ? and create_time <=?`
-	err = o.Raw(sql, companyId, productId, createTime.Add(-2*60*time.Second), createTime.Add(2*60*time.Second)).QueryRow(&item)
-	return
-}

models/company/company_seller.go

@@ -1,25 +1,11 @@
 package company
 
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"hongze/hz_eta_api/utils"
-)
-
 type CompanySellers struct {
 	AdminId   int    `description:"系统用户id"`
 	AdminName string `description:"系统用户名称"`
 	RealName  string `description:"用户真实名称"`
 }
 
-func GetCompanySeller(roleTypeCode string) (items []*CompanySellers, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.admin_id,a.admin_name,real_name FROM admin AS a
-			INNER JOIN sys_role AS b ON a.role_id=b.role_id
-			WHERE enabled=1 AND b.role_type_code IN(` + roleTypeCode + `) ORDER BY created_time DESC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 type CompanySellerResp struct {
 	List []*CompanySellers
 }
@@ -37,49 +23,3 @@ type DepartmentGroupSellers struct {
 	RoleTypeCode string                   `description:"角色编码"`
 	Authority    int                      `description:"管理权限，0：无，1：部门负责人，2：小组负责人,或者ficc销售主管，4:ficc销售组长"`
 }
-
-func GetCompanyCheckSeller(condition string, pars []interface{}) (items []*CompanySellers, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.admin_id,a.admin_name,real_name FROM admin AS a
-			INNER JOIN sys_role AS b ON a.role_id=b.role_id
-			WHERE enabled=1 AND b.role_type_code IN(` + utils.ROLE_TYPE_SELLERS + `)  `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `ORDER BY created_time DESC`
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-	return
-}
-
-// 根据企业id获取对应的销售信息
-func GetCompanySellerByCompanyId(companyId int) (items []*CompanySellers, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.admin_id,a.admin_name,real_name FROM admin AS a
-			INNER JOIN sys_role AS b ON a.role_id=b.role_id
-			INNER JOIN company_product AS c ON a.admin_id=c.seller_id
-			WHERE enabled=1 AND c.company_id=? ORDER BY created_time DESC `
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
-	return
-}
-
-// GetCompanySellerByRoleCodes
-func GetCompanySellerByRoleCodes(roleTypeCodes []string) (items []*CompanySellers, err error) {
-	itemsLen := len(roleTypeCodes)
-	if itemsLen == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				a.admin_id,
-				a.admin_name,
-				real_name
-			FROM
-				admin AS a
-			INNER JOIN sys_role AS b ON a.role_id = b.role_id
-			WHERE
-				enabled = 1 AND b.role_type_code IN (` + utils.GetOrmInReplace(itemsLen) + `)
-			ORDER BY
-				created_time DESC `
-	_, err = o.Raw(sql, roleTypeCodes).QueryRows(&items)
-	return
-}

models/company/company_service_record.go

@@ -1,145 +0,0 @@
-package company
-
-import (
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"strings"
-	"time"
-)
-
-// CompanyServiceRecord 客户-服务记录表
-type CompanyServiceRecord struct {
-	CompanyServiceRecordId int       `orm:"column(company_service_record_id);pk" description:"服务记录ID"`
-	CompanyId              int       `description:"客户ID"`
-	Content                string    `description:"内容"`
-	SysAdminId             int       `description:"创建人ID"`
-	SysAdminName           string    `description:"创建人姓名"`
-	CreateTime             time.Time `description:"创建时间"`
-	ModifyTime             time.Time `description:"修改时间"`
-}
-
-var CompanyServiceRecordColumns = struct {
-	CompanyServiceRecordId string
-	CompanyId              string
-	Content                string
-	SysAdminId             string
-	SysAdminName           string
-	CreateTime             string
-	ModifyTime             string
-}{
-	CompanyServiceRecordId: "company_service_record_id",
-	CompanyId:              "company_id",
-	Content:                "content",
-	SysAdminId:             "sys_admin_id",
-	SysAdminName:           "sys_admin_name",
-	CreateTime:             "create_time",
-	ModifyTime:             "modify_time",
-}
-
-func (m *CompanyServiceRecord) TableName() string {
-	return "company_service_record"
-}
-
-func (m *CompanyServiceRecord) Create() (err error) {
-	o := orm.NewOrm()
-	id, err := o.Insert(m)
-	if err != nil {
-		return
-	}
-	m.CompanyServiceRecordId = int(id)
-	return
-}
-
-func (m *CompanyServiceRecord) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
-	return
-}
-
-func (m *CompanyServiceRecord) Del() (err error) {
-	o := orm.NewOrm()
-	sql := `DELETE FROM company_service_record WHERE company_service_record_id = ? LIMIT 1`
-	_, err = o.Raw(sql, m.CompanyServiceRecordId).Exec()
-	return
-}
-
-func (m *CompanyServiceRecord) GetItemById(id int) (err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_service_record WHERE company_service_record_id = ? LIMIT 1`
-	err = o.Raw(sql, id).QueryRow(&m)
-	return
-}
-
-func (m *CompanyServiceRecord) GetItemByCondition(condition string, pars []interface{}) (err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM company_service_record WHERE 1=1 `
-	sql += condition
-	sql += ` LIMIT 1`
-	err = o.Raw(sql, pars).QueryRow(&m)
-	return
-}
-
-func (m *CompanyServiceRecord) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
-	sql := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
-	err = o.Raw(sql, pars).QueryRow(&count)
-	return
-}
-
-func (m *CompanyServiceRecord) GetItemsByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string) (items []*CompanyServiceRecord, err error) {
-	o := orm.NewOrm()
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := `ORDER BY create_time DESC`
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-	return
-}
-
-func (m *CompanyServiceRecord) GetPageItemsByCondition(startSize, pageSize int, condition string, pars []interface{}, fieldArr []string, orderRule string) (total int, items []*CompanyServiceRecord, err error) {
-	o := orm.NewOrm()
-	fields := strings.Join(fieldArr, ",")
-	if len(fieldArr) == 0 {
-		fields = `*`
-	}
-	order := `ORDER BY create_time DESC`
-	if orderRule != "" {
-		order = ` ORDER BY ` + orderRule
-	}
-	sql := fmt.Sprintf(`SELECT %s FROM %s WHERE 1=1 %s %s`, fields, m.TableName(), condition, order)
-	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
-	if err = o.Raw(totalSql, pars).QueryRow(&total); err != nil {
-		return
-	}
-	sql += ` LIMIT ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-	return
-}
-
-type CompanyServiceRecordAddReq struct {
-	CompanyId int    `description:"客户ID"`
-	Content   string `description:"内容"`
-}
-
-type CompanyServiceRecordDelReq struct {
-	CompanyServiceRecordId int `description:"服务记录ID"`
-}
-
-type CompanyServiceRecordPageListResp struct {
-	List   []*CompanyServiceRecordItem
-	Paging *paging.PagingItem `description:"分页数据"`
-}
-
-type CompanyServiceRecordItem struct {
-	CompanyServiceRecordId int    `description:"文档ID"`
-	Content                string `description:"服务描述"`
-	SysAdminId             int    `description:"创建人ID"`
-	SysAdminName           string `description:"创建人姓名"`
-	CreateTime             string `description:"创建时间"`
-}

models/company/seller_company_permission.go

@@ -1,75 +0,0 @@
-package company
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/paging"
-	"time"
-)
-
-type SellerCompanyPermission struct {
-	Id             int       `orm:"column(id);pk" description:"自增序号ID"`
-	AdminId        int       `orm:"column(admin_id)" description:"系统用户id"`
-	Enabled        int       `orm:"column(enabled)" description:"权限状态1:开放权限，0:禁用权限"`
-	CreateTime     time.Time `orm:"column(create_time)" description:"创建时间"`
-	ModifyTime     time.Time `orm:"column(modify_time)" description:"修改时间"`
-	PermissionType int       `orm:"column(permission_type)" description:"权限类型（1:添加用户权限）"`
-}
-
-// ReceiveGroupSellersResp 销售列表（根据部门、分组来）
-type ReceiveGroupSellersResp struct {
-	List []ReceiveGroupSellers
-}
-
-type ReceiveGroupSellers struct {
-	AdminId      string                   `description:"系统用户id"`
-	RealName     string                   `description:"用户真实名称"`
-	ChildrenList []ReceiveGroupSellers `description:"销售列表"`
-}
-
-type ReceiveSellerListResp struct {
-	List   []*ReceiveSellerItemResp
-	Paging *paging.PagingItem
-}
-
-type ReceiveSellerItemResp struct {
-	AdminId         int    `description:"销售id"`
-	Enabled         int    `description:"权限状态1:开放权限，0:禁用权限"`
-	DepartmentGroup string `description:"所属分组"`
-	RealName        string `description:"销售姓名"`
-}
-
-type ChangeReceivePermissionReq struct {
-	AdminId         int    `description:"销售id"`
-	Enabled         int    `description:"权限状态1:开放权限，0:禁用权限"`
-}
-
-// 新增权限记录
-func AddSellerCompanyPermission(permission *SellerCompanyPermission) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(permission)
-	return
-}
-
-// GetSellerCompanyPermissionByAdminIdType 根据权限类型查询销售的权限详情
-func GetSellerCompanyPermissionByAdminIdType(adminId, permissionType int) (item *SellerCompanyPermission, err error)  {
-	o := orm.NewOrm()
-	sql := ` select *  FROM seller_company_permission WHERE admin_id=? and permission_type=?`
-	err = o.Raw(sql, adminId, permissionType).QueryRow(&item)
-	return
-}
-
-// GetSellerCompanyPermissionByAdminIdsType 根据权限类型查询销售的权限详情
-func GetSellerCompanyPermissionByAdminIdsType(adminIds string, permissionType int) (list []*SellerCompanyPermission, err error)  {
-	o := orm.NewOrm()
-	sql := ` select *  FROM seller_company_permission WHERE admin_id in (`+adminIds+`) and permission_type=?`
-	_, err = o.Raw(sql, permissionType).QueryRows(&list)
-	return
-}
-
-//UpdateSellerCompanyPermissionEnabledById 启用或禁用销售的某种类型的权限
-func UpdateSellerCompanyPermissionEnabledById(id, enabled int) (err error) {
-	o := orm.NewOrm()
-	msql := " UPDATE seller_company_permission SET enabled = ?,modify_time=NOW() WHERE id = ? "
-	_, err = o.Raw(msql, enabled, id).Exec()
-	return
-}

models/company/wx_user_op_log.go

@@ -1,30 +0,0 @@
-package company
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-// WxUserOpLog 联系人操作日志表
-type WxUserOpLog struct {
-	Id                     int       `orm:"column(id);pk"`
-	LogType                string    `description:"日志类型：add，edit，move"`
-	UserId                 int       `description:"联系人id"`
-	CompanyId              int       `description:"客户id"`
-	Mobile                 string    `description:"当前手机号"`
-	Email                  string    `description:"当前邮箱"`
-	OriginalUserInfo       string    `description:"变更前的联系人信息"`
-	UserInfo               string    `description:"当前联系人信息"`
-	OriginalUserSellerInfo string    `description:"变更前的联系人销售归属"`
-	UserSellerInfo         string    `description:"当前联系人销售归属"`
-	OpUserId               int       `description:"操作人编号"`
-	OpUserName             string    `description:"操作人名称"`
-	CreateTime             time.Time `description:"日志创建时间"`
-}
-
-// AddWxUserOpLog 新增客户产品
-func AddWxUserOpLog(item *WxUserOpLog) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
-	return
-}

models/company_source.go

@@ -1,24 +0,0 @@
-package models
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-)
-
-type CompanySource struct {
-	SourceId   int    `orm:"column(source_id);pk"`
-	SourceName string `description:"来源名称"`
-}
-
-// 客户来源列表
-type CompanySourceListResp struct {
-	List []*CompanySource `description:"客户来源列表"`
-}
-
-// 获取来源列表
-func GetAllCompanySourceList() (items []*CompanySource, err error) {
-	sql := ``
-	sql = `SELECT * FROM company_source  ORDER BY sort DESC  `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}

models/company_user/chart_classify_permission.go

@@ -1,96 +0,0 @@
-package company_user
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-// 联系人图表分类权限
-type ChartClassifyPermission struct {
-	Id         int       `orm:"column(id);pk"`
-	CompanyId  int       `description:"客户ID"`
-	UserId     int       `description:"用户ID"`
-	StartTime  time.Time `description:"起始时间"`
-	EndTime    time.Time `description:"终止时间"`
-	Enabled    int       `description:"状态 0-关闭 1-开启"`
-	CreateTime time.Time `description:"创建时间"`
-	UpdateTime time.Time `description:"更新时间"`
-}
-
-func (chartClassifyPermission *ChartClassifyPermission) TableName() string {
-	return "company_user_chart_classify_permission"
-}
-
-// Update 更新分类权限
-func (chartClassifyPermission *ChartClassifyPermission) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(chartClassifyPermission, cols...)
-	return
-}
-
-// AddChartClassifyPermission 新增分类权限
-func AddChartClassifyPermission(item *ChartClassifyPermission) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-// GetChartClassifyPermissionByUserId 获取联系人分类权限
-func GetChartClassifyPermissionByUserId(userId int) (item *ChartClassifyPermission, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM company_user_chart_classify_permission WHERE user_id = ? `
-	err = o.Raw(sql, userId).QueryRow(&item)
-	return
-}
-
-// GetChartClassifyPermissionListByUserIds 通过联系人Id集合获取分类权限列表
-func GetChartClassifyPermissionListByUserIds(userIds string) (list []*ChartClassifyPermission, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM company_user_chart_classify_permission WHERE user_id IN (` + userIds + `) `
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
-// ClearCompanyChartPermission 清除客户下所有联系人图表权限
-func ClearCompanyChartPermission(companyId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM company_user_chart_classify_permission WHERE company_id = ? `
-	_, err = o.Raw(sql, companyId).Exec()
-	return
-}
-
-// GetCompanyChartPermissionByCompanyId 获取客户下所有联系人图表权限
-func GetCompanyChartPermissionByCompanyId(companyId int) (items []*ChartClassifyPermission, err error) {
-	o := orm.NewOrm()
-	sql := ` select * FROM company_user_chart_classify_permission WHERE company_id = ? `
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
-	return
-}
-
-// ClearUserChartPermission 清除联系人图表权限
-func ClearUserChartPermission(userId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM company_user_chart_classify_permission WHERE user_id = ? LIMIT 1 `
-	_, err = o.Raw(sql, userId).Exec()
-	return
-}
-
-// CompanyUserChartPermissionOperationRecord 图表权限设置记录
-type CompanyUserChartPermissionOperationRecord struct {
-	Id         int       `orm:"column(id);pk"`
-	Type       int       `description:"操作类型 1-新增 2-编辑"`
-	CompanyId  int       `description:"当前所属客户ID"`
-	UserId     int       `description:"用户ID"`
-	AdminId    int       `description:"操作人ID"`
-	StartTime  time.Time `description:"设置的起始时间"`
-	EndTime    time.Time `description:"设置的终止时间"`
-	Enabled    int       `description:"设置的开启关闭状态"`
-	CreateTime time.Time `description:"操作时间"`
-}
-
-// AddChartPermissionOperationRecord 新增图表权限设置记录
-func AddChartPermissionOperationRecord(item *CompanyUserChartPermissionOperationRecord) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}

models/db.go

@@ -4,7 +4,6 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"hongze/hz_eta_api/models/aimod"
 	"hongze/hz_eta_api/models/company"
-	"hongze/hz_eta_api/models/company_user"
 	"hongze/hz_eta_api/models/data_manage"
 	future_good2 "hongze/hz_eta_api/models/data_manage/future_good"
 	"hongze/hz_eta_api/models/data_manage/supply_analysis"
@@ -56,6 +55,16 @@ func init() {
 	gl, _ := orm.GetDB("gl")
 	gl.SetConnMaxLifetime(10 * time.Minute)
 
+	// 用户主库
+	if utils.MYSQL_WEEKLY_URL != `` {
+		_ = orm.RegisterDataBase("weekly", "mysql", utils.MYSQL_WEEKLY_URL)
+		orm.SetMaxIdleConns("weekly", 50)
+		orm.SetMaxOpenConns("weekly", 100)
+
+		weeklyDb, _ := orm.GetDB("weekly")
+		weeklyDb.SetConnMaxLifetime(10 * time.Minute)
+	}
+
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)
 
@@ -63,7 +72,6 @@ func init() {
 	orm.RegisterModel(
 		new(Classify),
 		new(Resource),
-		new(OssSTSToken),
 		new(PptV2),
 		new(PptV2PublishRecord),
 		new(PptV2SaveLog),
@@ -150,16 +158,7 @@ func initSystem() {
 // initCompany 客户相关 数据表
 func initCompany() {
 	orm.RegisterModel(
-		new(company.CompanyApprovalMessage),
-		new(company.CompanyOperationRecord),
 		new(company.Company),
-		new(company.CompanyLog),
-		new(company.CompanyProductUpdateLog),                 //客户产品变更状态表
-		new(company.CompanyProductTryOutUpdateLog),           //客户产品试用变更状态表
-		new(company.CompanyProductTryOutUpdatePermissionLog), //客户产品试用变更品种详情表
-		new(company.WxUserOpLog),                             //联系人日志记录表
-		new(company.SellerCompanyPermission),                 //销售客户权限（"添加客户"权限）
-		new(company.CompanyServiceRecord),                    // 客户服务记录表
 	)
 }
 
@@ -168,9 +167,6 @@ func initWxUser() {
 	orm.RegisterModel(
 		new(WxUser),
 		new(UserSellerRelation),
-		new(UserRecord),
-		new(company_user.ChartClassifyPermission),                   // 联系人图表权限表
-		new(company_user.CompanyUserChartPermissionOperationRecord), // 联系人图表权限操作记录表
 	)
 }
 
@@ -185,7 +181,6 @@ func initReport() {
 		new(ReportChapterTicker),                 // 晨报章节ticker
 		new(ReportChapterTypePermission),         // 晨周报章节类型权限表
 		new(GroupSendMsg),                        //群发消息
-		new(UserTemplateRecord),                  //模板消息记录
 		new(ChartPermission),                     // 权限表
 		new(YbPcSuncode),
 		new(YbSuncodePars),

models/group_send_msg.go

@@ -29,9 +29,9 @@ type GroupSendMsg struct {
 	CreateTime  time.Time `description:"发送时间"`
 }
 
-// 新增群发消息
+// Add 新增群发消息
 func (groupSendMsg *GroupSendMsg) Add() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	id, err := o.Insert(groupSendMsg)
 	if err != nil {
 		return
@@ -40,9 +40,9 @@ func (groupSendMsg *GroupSendMsg) Add() (err error) {
 	return
 }
 
-// 修改群发消息
+// Update 修改群发消息
 func (groupSendMsg *GroupSendMsg) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(groupSendMsg, cols...)
 	return
 }

models/oss_sts_token.go

@@ -1,34 +0,0 @@
-package models
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-type OssSTSToken struct {
-	Id              int       `orm:"column(id);pk" json:"id"`
-	AccessKeyId     string    `json:"access_key_id" description:"临时AccessKeyId"`
-	AccessKeySecret string    `json:"access_key_secret" description:"临时AccessKeySecret"`
-	SecurityToken   string    `json:"security_token" description:"安全令牌"`
-	ExpiredTime     time.Time `json:"expired_time" description:"过期时间"`
-}
-
-// TableName 表名变更
-func (item *OssSTSToken) TableName() string {
-	return "oss_sts_token"
-}
-
-// Insert 新增
-func (item *OssSTSToken) Insert() (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
-// GetRecentOssSTSToken 获取最新的STSToken
-func GetRecentOssSTSToken() (item *OssSTSToken, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM oss_sts_token ORDER BY expired_time DESC LIMIT 1 `
-	err = o.Raw(sql).QueryRow(&item)
-	return
-}

models/permission.go

@@ -13,7 +13,7 @@ type ChartPermissionSearchKeyWordMapping struct {
 }
 
 func GetPermission(classifyNameSecond string) (items []*ChartPermissionSearchKeyWordMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM chart_permission_search_key_word_mapping AS a WHERE a.from='rddp' AND a.key_word=? `
 	_, err = o.Raw(sql, classifyNameSecond).QueryRows(&items)
 	return
@@ -21,7 +21,7 @@ func GetPermission(classifyNameSecond string) (items []*ChartPermissionSearchKey
 
 // EditChartPermissionSearchKeyWordMappingMulti 修改报告报告权限（先删除原有的权限，再添加新的权限）
 func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdList []int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -56,24 +56,17 @@ func EditChartPermissionSearchKeyWordMappingMulti(keyword string, permissionIdLi
 	return
 }
 
-// AddChartPermissionSearchKeyWordMappingMulti 批量新增报告权限
-func AddChartPermissionSearchKeyWordMappingMulti(chartPermissionSearchKeyWordMappingList []*ChartPermissionSearchKeyWordMapping) (err error) {
-	o := orm.NewOrm()
-	_, err = o.InsertMulti(len(chartPermissionSearchKeyWordMappingList), chartPermissionSearchKeyWordMappingList)
-	return
-}
-
 func AddChartPermissionChapterMapping(chartPermissionId int, reportId int64) (err error) {
 	sql := `INSERT INTO chart_permission_chapter_mapping (chart_permission_id, report_chapter_type_id,research_type)
            VALUES(?,?,?)`
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Raw(sql, chartPermissionId, reportId, "rddp").Exec()
 	return
 }
 
 func RemoveChartPermissionChapterMapping(reportId int64) (err error) {
 	sql := ` DELETE FROM chart_permission_chapter_mapping WHERE research_type=? AND report_chapter_type_id=? `
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Raw(sql, "rddp", reportId).Exec()
 	return
 }
@@ -84,7 +77,7 @@ type ChartPermissionMappingIdName struct {
 }
 
 func GetChartPermissionNameFromMappingByKeyword(keyword string, source string) (list []*ChartPermissionMappingIdName, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := " SELECT b.chart_permission_id AS permission_id,b.permission_name FROM chart_permission_search_key_word_mapping AS a INNER JOIN chart_permission AS b ON a.chart_permission_id = b.chart_permission_id WHERE a.`from` = ? AND a.key_word = ? "
 	_, err = o.Raw(sql, source, keyword).QueryRows(&list)
 
@@ -93,8 +86,8 @@ func GetChartPermissionNameFromMappingByKeyword(keyword string, source string) (
 
 // UpdateChartPermissionNameFromMappingByKeyword 根据关键词及来源更新新关键词
 func UpdateChartPermissionNameFromMappingByKeyword(newKeyword, keyword, source string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := " UPDATE chart_permission_search_key_word_mapping SET key_word = ? WHERE key_word = ? AND `from` = ? "
 	_, err = o.Raw(sql, newKeyword, keyword, source).Exec()
 	return
-}
+}

models/report_chapter_ticker.go

@@ -57,7 +57,7 @@ type DailyBaseColumn struct {
 
 // GetDailyBaseColumnList 获取基础列列表
 func GetDailyBaseColumnList(keyword string, typeId int) (list []*DailyBaseColumn, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM daily_base_column WHERE 1 = 1 `
 	pars := make([]interface{}, 0)
 	if keyword != "" {

models/report_chapter_type.go

@@ -33,7 +33,7 @@ type ReportChapterType struct {
 }
 
 func (item *ReportChapterType) Create() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	id, err := o.Insert(item)
 	if err != nil {
 		return
@@ -43,14 +43,14 @@ func (item *ReportChapterType) Create() (err error) {
 }
 
 func (item *ReportChapterType) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(item, cols...)
 	return
 }
 
 // DeleteReportChapterType 删除章节类型及相关权限
 func DeleteReportChapterType(typeId int, reportType string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -81,7 +81,7 @@ func DeleteReportChapterType(typeId int, reportType string) (err error) {
 
 // GetReportChapterTypeById 获取章节类型
 func GetReportChapterTypeById(reportChapterTypeId int) (item *ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE report_chapter_type_id = ? `
 	err = o.Raw(sql, reportChapterTypeId).QueryRow(&item)
 	return
@@ -89,7 +89,7 @@ func GetReportChapterTypeById(reportChapterTypeId int) (item *ReportChapterType,
 
 // GetReportChapterTypeList 获取章节类型列表
 func GetReportChapterTypeList() (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 1 `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -97,7 +97,7 @@ func GetReportChapterTypeList() (list []*ReportChapterType, err error) {
 
 // GetReportChapterTypeListByResearchType 通过报告类型获取章节类型列表
 func GetReportChapterTypeListByResearchType(researchType string) (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE research_type = ? AND enabled = 1`
 	_, err = o.Raw(sql, researchType).QueryRows(&list)
 	return
@@ -105,7 +105,7 @@ func GetReportChapterTypeListByResearchType(researchType string) (list []*Report
 
 // GetAllReportChapterTypeListByResearchType 通过报告类型获取章节类型列表
 func GetAllReportChapterTypeListByResearchType(researchType string) (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE research_type = ?`
 	_, err = o.Raw(sql, researchType).QueryRows(&list)
 	return
@@ -113,7 +113,7 @@ func GetAllReportChapterTypeListByResearchType(researchType string) (list []*Rep
 
 // GetAllReportChapterTypeList 通过传入的条件获取所有的章节类型列表
 func GetAllReportChapterTypeList(condition string, pars []interface{}) (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1=1 `
 	sql += condition
 	_, err = o.Raw(sql, pars).QueryRows(&list)
@@ -122,7 +122,7 @@ func GetAllReportChapterTypeList(condition string, pars []interface{}) (list []*
 
 // GetEnableReportChapterTypeList 获取未暂停的章节类型列表
 func GetEnableReportChapterTypeList(researchType string) (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT
 				*
 			FROM
@@ -151,7 +151,7 @@ type DayWeekReportPauseTime struct {
 
 // GetDayWeekReportPauseTimeList 获取晨报周报暂停时间
 func GetDayWeekReportPauseTimeList() (list []*DayWeekReportPauseTime, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT research_type, MAX(a.pause_start_time) AS pause_start_time, MAX(a.pause_end_time) AS pause_end_time FROM report_chapter_type AS a WHERE a.is_set = 1 GROUP BY a.research_type`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -177,7 +177,7 @@ type SetDayWeekReportEnableUpdateRuleReq struct {
 
 // ResetDayWeekReportUpdateRule 重置章节类型的暂停时间
 func ResetDayWeekReportUpdateRule(researchType string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` UPDATE report_chapter_type SET pause_start_time = null, pause_end_time = null, is_set = 0 WHERE research_type = ?`
 	_, err = o.Raw(sql, researchType).Exec()
 	return
@@ -185,7 +185,7 @@ func ResetDayWeekReportUpdateRule(researchType string) (err error) {
 
 // SetDayWeekReportUpdateRule 设置章节类型的暂停时间
 func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateRule) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -221,7 +221,7 @@ func SetDayWeekReportUpdateRule(researchType string, list []DayWeekReportUpdateR
 
 // SetDayWeekReportEnableUpdateRule 设置章节类型的禁用状态
 func SetDayWeekReportEnableUpdateRule(dayReportChapterTypeIdList, weekReportChapterTypeIdList []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -279,7 +279,7 @@ type StopUpdateReportChapterTypeResp struct {
 
 // GetStopUpdateReportChapterTypeListByResearchType 获取暂停更新章节类型列表
 func GetStopUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE is_set = 1 AND pause_end_time >= ? AND enabled = 1 `
 	_, err = o.Raw(sql, time.Now().Format(utils.FormatDate)).QueryRows(&list)
 	return
@@ -287,7 +287,7 @@ func GetStopUpdateReportChapterTypeListByResearchType() (list []*ReportChapterTy
 
 // GetDisableUpdateReportChapterTypeListByResearchType 获取停止更新的章节类型列表
 func GetDisableUpdateReportChapterTypeListByResearchType() (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE enabled = 0`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -306,7 +306,7 @@ type ReportChapterTypePageListResp struct {
 
 // GetReportChapterTypeCount 获取章节类型总数
 func GetReportChapterTypeCount(condition string, pars []interface{}) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT COUNT(1) FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	err = o.Raw(sql, pars).QueryRow(&count)
@@ -315,7 +315,7 @@ func GetReportChapterTypeCount(condition string, pars []interface{}) (count int,
 
 // GetReportChapterTypeList 获取章节类型列表
 func GetReportChapterTypePageList(condition string, pars []interface{}, startSize, pageSize int) (list []*ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += ` ORDER BY sort ASC, created_time DESC`
@@ -376,7 +376,7 @@ type ReportChapterTypeAuthSettingReq struct {
 
 // GetReportChapterTypeByCondition 获取章节类型
 func GetReportChapterTypeByCondition(condition string, pars []interface{}) (item *ReportChapterType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type WHERE 1 = 1 `
 	sql += condition
 	sql += ` LIMIT 1`

models/report_chapter_type_permission.go

@@ -16,16 +16,9 @@ type ReportChapterTypePermission struct {
 	CreatedTime           time.Time `description:"创建时间"`
 }
 
-// AddChapterTypePermission 新增章节类型权限
-func AddChapterTypePermission(item *ReportChapterTypePermission) (lastId int64, err error) {
-	o := orm.NewOrm()
-	lastId, err = o.Insert(item)
-	return
-}
-
 // GetChapterTypePermissionByTypeIdAndResearchType 根据章节类型ID及研报类型获取章节类型权限列表
 func GetChapterTypePermissionByTypeIdAndResearchType(typeId int, researchType string) (list []*ReportChapterTypePermission, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM report_chapter_type_permission WHERE report_chapter_type_id = ? AND research_type = ? ORDER BY chart_permission_id ASC `
 	_, err = o.Raw(sql, typeId, researchType).QueryRows(&list)
 	return
@@ -33,7 +26,7 @@ func GetChapterTypePermissionByTypeIdAndResearchType(typeId int, researchType st
 
 // SetReportChapterTypePermission 设置报告章节类型权限
 func SetReportChapterTypePermission(chapterTypeId int, researchType string, newPermissions []*ReportChapterTypePermission, newWeekPermissions []*ChartPermissionChapterMapping) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	to, err := o.Begin()
 	if err != nil {
 		return

models/research_report.go

@@ -28,20 +28,9 @@ type ResearchReport struct {
 	Viewers             int       `description:"H5观看用户数"`
 }
 
-// GetResearchReportListByIds 根据报告id集合获取报告数据列表
-func GetResearchReportListByIds(researchReportIds string) (list []*ResearchReport, err error) {
-	if researchReportIds == "" {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `select * from research_report where research_report_id in (` + researchReportIds + `)`
-	_, err = o.Raw(sql).QueryRows(&list)
-	return
-}
-
 // Update 更新数据
 func (researchReport *ResearchReport) Update(updateCols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(researchReport, updateCols...)
 	return
 }
@@ -66,28 +55,9 @@ type ResearchReportList struct {
 	LinkUrl             string    `description:"报告阅读地址"`
 }
 
-// GetResearchReportList 获取报告列表
-func GetResearchReportList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*ResearchReportList, err error) {
-	o := orm.NewOrm()
-
-	sql := `select * from research_report where enabled = 1 `
-	sql += condition
-	sql += ` order by research_report_date desc,created_time desc `
-
-	totalSql := `select count(1) total from (` + sql + `) z `
-	err = o.Raw(totalSql, pars).QueryRow(&total)
-	if err != nil {
-		return
-	}
-	sql += ` LIMIT ?,? `
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
-
-	return
-}
-
 // 获取今年报告
 func GetMigrateReportList() (list []*ResearchReport, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT
 				*
 			FROM
@@ -134,43 +104,22 @@ type ResearchReportTypeTicker struct {
 	LastUpdatedTime            time.Time `description:"最近一次更新时间"`
 }
 
-func GetResearchReportTypeList(researchReportId int) (list []*ResearchReportType, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM research_report_type WHERE research_report_id = ? ORDER BY created_time ASC `
-	_, err = o.Raw(sql, researchReportId).QueryRows(&list)
-	return
-}
-
 func GetResearchReportTypeListByReportIds(reportIds string) (list []*ResearchReportType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM research_report_type WHERE research_report_id IN (` + reportIds + `) ORDER BY created_time ASC,research_report_type_id ASC `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
-func GetResearchReportTypeContentList(researchReportTypeId int) (list []*ResearchReportTypeContent, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM research_report_type_content WHERE research_report_type_id = ? ORDER BY sort ASC `
-	_, err = o.Raw(sql, researchReportTypeId).QueryRows(&list)
-	return
-}
-
 func GetResearchReportTypeContentListByReportTypeIds(reportTypeIds string) (list []*ResearchReportTypeContent, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM research_report_type_content WHERE research_report_type_id IN (` + reportTypeIds + `) ORDER BY research_report_type_id ASC,sort ASC `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
 }
 
-func GetResearchReportTypeTickerList(researchReportTypeId int) (list []*ResearchReportTypeTicker, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM research_report_type_ticker WHERE research_report_type_id = ? ORDER BY sort ASC `
-	_, err = o.Raw(sql, researchReportTypeId).QueryRows(&list)
-	return
-}
-
 func GetResearchReportTypeTickerListByReportTypeIds(reportTypeIds string) (list []*ResearchReportTypeTicker, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM research_report_type_ticker WHERE research_report_type_id IN (` + reportTypeIds + `) ORDER BY research_report_type_id ASC,sort ASC `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -267,7 +216,7 @@ func CreateMigrateNewOtherReport(reportInfo *Report, mappingList []*ChartPermiss
 	// 新增权限
 	newReportId = int(reportId)
 	if len(mappingList) > 0 {
-		r := orm.NewOrm()
+		r := orm.NewOrmUsingDB("weekly")
 		for _, mapping := range mappingList {
 			sql := ` INSERT INTO chart_permission_chapter_mapping (chart_permission_id, report_chapter_type_id,research_type) VALUES(?,?,?) `
 			if _, err = r.Raw(sql, mapping.ChartPermissionId, newReportId, "rddp").Exec(); err != nil {
@@ -287,15 +236,8 @@ type ChartPermissionChapterMapping struct {
 	ResearchType        string `description:"报告类型 week;two_week;tactic;month;other;rddp; "`
 }
 
-func GetChapterPermissionMappingByCondition(reportChapterTypeId int, researchType string) (list []*ChartPermissionChapterMapping, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT * FROM chart_permission_chapter_mapping WHERE report_chapter_type_id = ? AND research_type = ? `
-	_, err = o.Raw(sql, reportChapterTypeId, researchType).QueryRows(&list)
-	return
-}
-
 func GetChapterPermissionMappingByResearchReportIds(researchReportIds string) (list []*ChartPermissionChapterMapping, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM chart_permission_chapter_mapping WHERE report_chapter_type_id IN (` + researchReportIds + `) AND research_type != "rddp" ORDER BY report_chapter_type_id ASC `
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -303,7 +245,7 @@ func GetChapterPermissionMappingByResearchReportIds(researchReportIds string) (l
 
 // GetResearchReportTypeListByReportId 根据报告ID获取报告章节
 func GetResearchReportTypeListByReportId(reportId int) (list []*ResearchReportType, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM research_report_type WHERE research_report_id = ? ORDER BY created_time ASC,research_report_type_id ASC `
 	_, err = o.Raw(sql, reportId).QueryRows(&list)
 	return
@@ -311,7 +253,7 @@ func GetResearchReportTypeListByReportId(reportId int) (list []*ResearchReportTy
 
 // GetResearchReportById 主键获取报告
 func GetResearchReportById(reportId int) (item *ResearchReport, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM research_report WHERE research_report_id = ? LIMIT 1`
 	err = o.Raw(sql, reportId).QueryRow(&item)
 	return

models/system/research_group.go

@@ -19,7 +19,7 @@ type ResearchGroup struct {
 
 // GetResearchGroupList 获取研究方向分组列表
 func GetResearchGroupList() (list []*ResearchGroup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM research_group WHERE state = 1 ORDER BY sort`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -124,4 +124,4 @@ func GetAdminResearchGroupListByAdminId(adminIds string) (list []*AdminResearchG
 				a.admin_id`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
-}
+}

models/system/sys_admin.go

@@ -173,46 +173,12 @@ type SysUserResetPassReq struct {
 	RePassword string `description:"重复密码"`
 }
 
-// 用户状态编辑
+// SysuserEditEnabledReq 用户状态编辑
 type SysuserEditEnabledReq struct {
 	AdminId int `description:"系统用户id"`
 	Enabled int `description:"1:有效，0:禁用"`
 }
 
-func EditAdmin(item *Admin) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE admin
-			SET
-			  admin_name= ?,
-			  real_name = ?,
-			  password = ?,
-			  last_updated_password_time = NOW(),
-			  email = ?,
-			  last_updated_time = NOW(),
-			  mobile = ?,
-			  role_type = ?,
-			  role_id = ?,
-			  role_name = ?,
-			  department_id = ?,
-			  department_name = ?,
-			  group_id = ?,
-			  group_name = ?,
-			  authority = ?,
-			  position = ?,
-			  role_type_code=?,
-			  enabled=?,
-			  admin_avatar = ?,
-			  province=?,
-			  province_code=?,
-			  city=?,
-			  city_code=?,
-			  employee_id = ?
-			WHERE admin_id = ? `
-	_, err = o.Raw(sql, item.AdminName, item.RealName, item.Password, item.Email, item.Mobile, item.RoleType, item.RoleId, item.RoleName, item.DepartmentId, item.DepartmentName,
-		item.GroupId, item.GroupName, item.Authority, item.Position, item.RoleTypeCode, item.Enabled, item.AdminAvatar, item.Province, item.ProvinceCode, item.City, item.CityCode, item.EmployeeId, item.AdminId).Exec()
-	return
-}
-
 // 变更状态
 func EditAdminEnabled(item *Admin) (err error) {
 	o := orm.NewOrm()
@@ -266,36 +232,6 @@ func GetSysUserItems(condition string, pars []interface{}) (items []*AdminItem,
 	return
 }
 
-func GetSysUserItemsOrderByCreated(condition string, pars []interface{}) (items []*AdminItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY created_time DESC `
-	_, err = o.Raw(sql, pars).QueryRows(&items)
-	return
-}
-func GetSysUserItemsList(condition string, pars []interface{}, startSize, pageSize int) (items []*AdminItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += ` ORDER BY created_time DESC limit ?,?`
-	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
-	return
-}
-func GetSysUserItemsTotal(condition string, pars []interface{}) (total int64, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT count(*) FROM admin WHERE 1=1 `
-	if condition != "" {
-		sql += condition
-	}
-	err = o.Raw(sql, pars).QueryRow(&total)
-	return
-}
-
 // GetGroupSysUserList 根据分组id获取系统用户列表
 func GetGroupSysUserList(groupId int) (items []*AdminItem, err error) {
 	o := orm.NewOrm()
@@ -354,14 +290,6 @@ func GetTeamSysUserList(teamId, enabled int) (items []*AdminItem, err error) {
 	return
 }
 
-// GetTeamSysUserList 根据小组id获取系统用户列表
-func GetTeamSysUserListByIds(ids string) (items []*AdminItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE group_id IN (` + ids + `) ORDER BY created_time DESC `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 func GetGroupIdByParentId(groupId int) (items []*string, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT group_id FROM sys_group WHERE parent_id=? ORDER BY create_time DESC `
@@ -369,13 +297,6 @@ func GetGroupIdByParentId(groupId int) (items []*string, err error) {
 	return
 }
 
-// GetSysUserByParentIdGroupId 查询主管下的所有组员
-func GetSysUserByParentIdGroupId(groupId int) (items []*AdminItem, err error) {
-	o := orm.NewOrm()
-	sql := `select real_name, role_id, role_type_code, group_id, admin_id from admin where group_id in (SELECT group_id from sys_group where parent_id=?) OR group_id=?`
-	_, err = o.Raw(sql, groupId, groupId).QueryRows(&items)
-	return
-}
 func GetAdminByGroupId(groupId int) (items []*AdminItem, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM admin WHERE group_id=? ORDER BY created_time DESC`
@@ -383,108 +304,11 @@ func GetAdminByGroupId(groupId int) (items []*AdminItem, err error) {
 	return
 }
 
-// GetSysAdminByIds 根据主键集合获取管理员信息
-func GetSysAdminByIds(adminIds string) (items []*Admin, err error) {
-	if adminIds == "" {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT * FROM admin WHERE admin_id IN (` + adminIds + `)`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 type OpenIdList struct {
 	OpenId  string
 	AdminId int
 }
 
-// GetAdminOpenIdListByMobile 根据手机号获取用户的openid列表
-func GetAdminOpenIdListByMobile(mobile string) (items []*OpenIdList, err error) {
-	sql := `SELECT admin_id, open_id FROM admin 
-          WHERE open_id != "" and mobile=? `
-	_, err = orm.NewOrm().Raw(sql, mobile).QueryRows(&items)
-	return
-}
-
-// ResearcherAdminAndUser 研究员admin信息及wx_user信息
-type ResearcherAdminAndUser struct {
-	UserId    int    `description:"用户ID"`
-	UserName  string `description:"用户名称"`
-	AdminId   int    `description:"管理员ID"`
-	AdminName string `description:"管理员姓名"`
-	OpenId    string `description:"openid"`
-}
-
-// GetResearcherAdminAndWxUserByAdminId 通过adminId获取研究员admin及user信息
-func GetResearcherAdminAndWxUserByAdminId(adminId int) (item *ResearcherAdminAndUser, err error) {
-	sql := `SELECT
-				a.admin_id,
-				a.real_name AS admin_name,
-				a.open_id,
-				b.user_id,
-				b.real_name AS user_name
-			FROM
-				admin AS a
-			JOIN wx_user AS b ON a.mobile = b.mobile
-			WHERE
-				a.admin_id = ? AND a.open_id != ""`
-	err = orm.NewOrm().Raw(sql, adminId).QueryRow(&item)
-	return
-}
-
-// 获取本组的销售ID
-func GetSelleridWhichGroup(companyId, productId int) (adminId string, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT
-			GROUP_CONCAT( DISTINCT admin_id SEPARATOR ',' ) AS adminId
-			FROM
-			admin
-			WHERE
-			group_id IN (
-			SELECT
-			a.group_id
-			FROM
-			company_product AS a
-			INNER JOIN admin AS b ON a.seller_id = b.admin_id
-			WHERE
-			a.company_id = ?
-			AND a.product_id = ?
-)`
-	err = o.Raw(sql, companyId, productId).QueryRow(&adminId)
-	return
-}
-
-// GetSysuserRaiList 获取权益销售
-func GetSysuserRaiList() (items []*AdminItem, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			real_name,
-			mobile,
-			group_name 
-		FROM
-			admin 
-		WHERE
-			role_type_code LIKE '%rai%' 
-			AND group_id NOT IN ( 19, 10, 17 ) 
-			AND enabled = 1 
-			OR real_name IN ( '沈涛', '张传星' )`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetSellerIdsByDepId(depId int) (ids []string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-	admin_id
-FROM
-	admin 
-WHERE
-	department_id = ?  `
-	_, err = o.Raw(sql, depId).QueryRows(&ids)
-	return
-}
-
 // GetRaiAdmin 获取权益内部人员(技术组+私募组)
 func GetRaiAdmin() (items []*AdminItem, err error) {
 	o := orm.NewOrm()

models/system/sys_user.go

@@ -86,30 +86,6 @@ func GetSysUserById(sysUserId int) (item *Admin, err error) {
 	return
 }
 
-// 根据权限code获取系统用户列表
-func GetAdminListByRoleCode(roleTypeCode string) (items []*Admin, err error) {
-	sql := `SELECT * FROM admin WHERE role_type_code=? and enabled=1 `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, roleTypeCode).QueryRows(&items)
-	return
-}
-
-// 根据权限id获取系统用户列表
-func GetAdminListByRoleId(roleId string) (items []*Admin, err error) {
-	sql := `SELECT * FROM admin WHERE role_id=? and enabled=1 `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, roleId).QueryRows(&items)
-	return
-}
-
-// GetAdminListByIds 根据用户id字符串获取系统用户列表
-func GetAdminListByIds(ids string) (items []*Admin, err error) {
-	sql := `SELECT * FROM admin WHERE admin_id in (` + ids + `) and enabled=1 `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 func ModifyPwd(sysUserId int, newPwd string) (err error) {
 	sql := `UPDATE admin SET password=?,last_updated_time=NOW() WHERE admin_id=? `
 	o := orm.NewOrm()
@@ -122,37 +98,6 @@ type ModifyPwdReq struct {
 	NewPwd string `description:"新密码"`
 }
 
-func GetAdminList() (items []*Admin, err error) {
-	sql := `SELECT * FROM admin`
-	o := orm.NewOrm()
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-// GetSysUserByMobile 根据手机号获取管理信息
-func GetSysUserByMobile(mobile string) (item *Admin, err error) {
-	sql := `SELECT * FROM admin WHERE mobile = ? LIMIT 1`
-	o := orm.NewOrm()
-	err = o.Raw(sql, mobile).QueryRow(&item)
-	return
-}
-
-// 通过用户姓名跟身份获取管理员信息
-func CheckSysUserByName(userName, roleTypeCode string) (item *Admin, err error) {
-	sql := ` SELECT a.*  FROM admin AS a WHERE a.real_name=? AND a.role_type_code=? LIMIT 1`
-	o := orm.NewOrm()
-	err = o.Raw(sql, userName, roleTypeCode).QueryRow(&item)
-	return
-}
-
-// GetAdminListByGroupId 根据分组id获取系统用户列表
-func GetAdminListByGroupId(groupId int) (items []*Admin, err error) {
-	sql := `SELECT * FROM admin WHERE group_id=? and enabled=1 `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, groupId).QueryRows(&items)
-	return
-}
-
 // AdminWxUserRelation 管理员-微信用户关联
 type AdminWxUserRelation struct {
 	AdminId   int    `json:"admin_id"`
@@ -161,25 +106,6 @@ type AdminWxUserRelation struct {
 	UserId    int    `json:"user_id"`
 }
 
-// GetAdminWxUserRelationByWxUserIds 通过微信用户及平台获取后台关联信息
-func GetAdminWxUserRelationByWxUserIds(platform int, userIds []int) (list []*AdminWxUserRelation, err error) {
-	userLen := len(userIds)
-	if userLen == 0 {
-		return
-	}
-	o := orm.NewOrm()
-	sql := `SELECT
-				ad.admin_id, ad.admin_name, ad.real_name, wu.user_id
-			FROM
-				admin AS ad
-			JOIN wx_user AS wu ON ad.mobile = wu.mobile
-			JOIN user_record AS ur ON wu.user_id = ur.user_id AND ur.create_platform = ?
-			WHERE
-				wu.user_id IN (` + utils.GetOrmInReplace(userLen) + `)`
-	_, err = o.Raw(sql, platform, userIds).QueryRows(&list)
-	return
-}
-
 // GetAdminListByIdList 根据用户id列表获取系统用户列表
 func GetAdminListByIdList(idList []int) (items []*Admin, err error) {
 	lenNum := len(idList)

models/user_record.go

@@ -1,100 +0,0 @@
-package models
-
-import (
-	"github.com/beego/beego/v2/client/orm"
-	"time"
-)
-
-type UserRecord struct {
-	UserRecordId   int       `orm:"column(user_record_id);pk"`
-	OpenId         string    `description:"用户openid，最大长度：32"`
-	UnionId        string    `description:"用户unionid，最大长度：64"`
-	Subscribe      int       `description:"是否关注"`
-	NickName       string    `descritpion:"用户昵称，最大长度：32"`
-	RealName       string    `descritpion:"用户实际名称，最大长度：32"`
-	BindAccount    string    `descritpion:"绑定时的账号，最大长度：128"`
-	Sex            int       `descritpion:"普通用户性别，1为男性，2为女性"`
-	Province       string    `description:"普通用户个人资料填写的省份,最大长度：30"`
-	City           string    `description:"普通用户个人资料填写的城市,最大长度：30"`
-	Country        string    `description:"国家，如中国为CN,最大长度：30"`
-	Headimgurl     string    `description:"用户第三方（微信）头像,最大长度：512"`
-	CreateTime     time.Time `description:"创建时间，关系添加时间、用户授权时间"`
-	CreatePlatform int       `description:"注册平台,1:日度点评公众号,2:管理后台，3：pc端网站,4:查研观向小程序；默认：1"`
-	SessionKey     string    `description:"微信小程序会话密钥，最大长度：255"`
-	UserId         int       `description:"用户id"`
-}
-
-//根据openid获取用户关系
-func GetUserRecordByOpenId(openId string) (item *UserRecord, err error) {
-	sql := `SELECT * FROM user_record WHERE open_id=? `
-	err = orm.NewOrm().Raw(sql, openId).QueryRow(&item)
-	return
-}
-
-//根据用户id和平台id获取用户关系
-func GetUserRecordByUserId(userId, platform int) (item *UserRecord, err error) {
-	sql := `SELECT * FROM user_record WHERE user_id=? AND create_platform = ?`
-	err = orm.NewOrm().Raw(sql, userId, platform).QueryRow(&item)
-	return
-}
-
-//添加用户关系
-func AddUserRecord(record *UserRecord) (recordId int64, err error) {
-	o := orm.NewOrm()
-	recordId, err = o.Insert(record)
-	return
-}
-
-//根据openid绑定用户关系
-func BindUserRecordByOpenid(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 ModifyUserRecordInfo(openId, nickName, headimgUrl, city, province, country string, sex, userId int) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE user_record SET nick_name=?,headimgurl=?,sex=?,city=?,province=?,country=? WHERE user_id=? and openid=? `
-	_, err = o.Raw(sql, nickName, headimgUrl, sex, city, province, country, userId, openId).Exec()
-	return
-}
-
-//根据用户id删除该用户的所有关联关系
-func DelUserRecordByUserId(userId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM user_record WHERE user_id=? `
-	_, err = o.Raw(sql, userId).Exec()
-	return
-}
-
-// GetUserRecordListByUserIds 根据用户id字符串批量获取该用户的所有关联关系
-func GetUserRecordListByUserIds(userIds string) (items []*UserRecord, err error) {
-	o := orm.NewOrm()
-	sql := ` select *  FROM user_record WHERE user_id in (` + userIds + `) `
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-//根据用户id字符串批量删除该用户的所有关联关系
-func DelUserRecordByUserIds(userIds string) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM user_record WHERE user_id in (` + userIds + `) `
-	_, err = o.Raw(sql).Exec()
-	return
-}
-
-//根据用户id字符串获取用户绑定时间结构体
-type UserRecordRegisterSlice struct {
-	UserId     int       `description:"用户id"`
-	CreateTime time.Time `description:"用户第三方信息绑定注册时间"`
-}
-
-//根据用户id字符串获取用户绑定时间
-func GetUserRecordRegisterByUserIds(userIds string) (items []*UserRecordRegisterSlice, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT user_id,min(create_time) as create_time FROM user_record WHERE user_id in (` + userIds + `) group by user_id`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}

models/user_seller_relation.go

@@ -18,166 +18,10 @@ type UserSellerRelation struct {
 	CreateTime time.Time `description:"创建时间"`
 }
 
-//添加销售员与员工的关系
-func AddUserSellerRelation(userId int64, companyId, sellerId, productId int, seller, mobile, email string) (lastId int64, err error) {
-	o := orm.NewOrm()
-	relation := UserSellerRelation{
-		UserId:     int(userId),
-		SellerId:   sellerId,
-		CompanyId:  companyId,
-		Seller:     seller,
-		ProductId:  productId,
-		Mobile:     mobile,
-		Email:      email,
-		CreateTime: time.Now(),
-		ModifyTime: time.Now(),
-	}
-	lastId, err = o.Insert(&relation)
-	return
-}
-
-//根据企业用户id修改所属销售
-func UpdateUserSellerRelationByCompanyId(companyId, productId, sellerId int, seller string) (err error) {
-	o := orm.NewOrm()
-	sql := `UPDATE user_seller_relation SET seller_id=?,seller = ? ,modify_time=NOW() WHERE company_id = ? AND product_id=?`
-	_, err = o.Raw(sql, sellerId, seller, companyId, productId).Exec()
-	return
-}
-
-//删除销售员与员工的关系
-func DeleteUserSellerRelation(userId, sellerId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM user_seller_relation WHERE user_id=? and seller_id = ?`
-	_, err = o.Raw(sql, userId, sellerId).Exec()
-	return
-}
-
-//根据产品id删除销售员与员工的关系
+// DeleteUserSellerRelationByProductId 根据产品id删除销售员与员工的关系
 func DeleteUserSellerRelationByProductId(userId, productId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` DELETE FROM user_seller_relation WHERE user_id=? and product_id = ?`
 	_, err = o.Raw(sql, userId, productId).Exec()
 	return
 }
-
-//根据联系人id删除所有销售员与该联系人的关系
-func DeleteUserSellerRelationByUserId(userId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM user_seller_relation WHERE user_id=? `
-	_, err = o.Raw(sql, userId).Exec()
-	return
-}
-
-//根据用户id和销售员id获取关系
-func GetUserSellerRelation(userId int64, sellerId int) (item *UserSellerRelation, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM user_seller_relation WHERE user_id = ? and seller_id= ?`
-	err = o.Raw(sql, userId, sellerId).QueryRow(&item)
-	return
-}
-
-//获取用户的销售员（产品）的关系数量
-func GetUserSellerRelationCount(userId int) (count int, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT COUNT(*) AS count
-			FROM user_seller_relation WHERE user_id = ? `
-	err = o.Raw(sql, userId).QueryRow(&count)
-	return
-}
-
-//通过用户id获取用户的销售员（产品）的关系
-func GetUserSellerRelationList(userId int) (list []*UserSellerRelation, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT *
-			FROM user_seller_relation WHERE user_id = ? `
-	_, err = o.Raw(sql, userId).QueryRows(&list)
-	return
-}
-
-//用户与销售员的关系数量切片
-type UserSellerRelationSlice struct {
-	Total      int    `description:"总阅读数"`
-	UserId     int    `description:"用户id"`
-	ProductIds string `description:"所属权限id"`
-}
-
-//根据用户id字符串，获取用户与销售员的关系数量
-func GetUserSellerRelationCountByUserIds(userIds string) (items []*UserSellerRelationSlice, err error) {
-	o := orm.NewOrm()
-	sql := `select *,COUNT(1) AS total,GROUP_CONCAT( DISTINCT product_id SEPARATOR ',' ) AS product_ids from (SELECT user_id, product_id
-			FROM user_seller_relation WHERE user_id in (` + userIds + `)  group by user_id,product_id) b group by user_id`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
-//根据用户产品权限来获取名片数
-func GetCompanyUserBusinessCardCountByProductId(companyId, productId int) (count int, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT COUNT(1) AS count FROM user_seller_relation a 
-left join wx_user b on a.user_id=b.user_id WHERE  a.company_id =? and a.product_id=? AND b.business_card_url<>'' `
-	err = o.Raw(sql, companyId, productId).QueryRow(&count)
-	return
-}
-
-// GetCompanyUserSellerRelationByProductId 根据企业id和产品id获取所有用户
-func GetCompanyUserSellerRelationByProductId(companyId, productId int) (items []*UserSellerRelation, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM user_seller_relation WHERE company_id = ? AND product_id=?`
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-//根据企业id和产品id获取所有不是该产品id的所有用户
-func GetNotCompanyUserSellerRelationByProductId(companyId, productId int) (items []*UserSellerRelation, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT user_id FROM user_seller_relation WHERE company_id = ? AND product_id != ?`
-	_, err = o.Raw(sql, companyId, productId).QueryRows(&items)
-	return
-}
-
-//根据产品id删除某个客户下 销售员与员工的关系
-func DelCompanyUserSellerRelationByProductId(companyId, productId int) (err error) {
-	o := orm.NewOrm()
-	sql := ` DELETE FROM user_seller_relation WHERE company_id = ? AND product_id = ? `
-	_, err = o.Raw(sql, companyId, productId).Exec()
-	return
-}
-
-//获取联系人分组信息
-type UserSellerRelationGroup struct {
-	RelationId     int64     `orm:"column(relation_id);pk"`
-	UserId         int       `description:"用户id"`
-	CompanyId      int       `description:"企业用户id"`
-	SellerId       int       `description:"销售id"`
-	Seller         string    `description:"销售员名称"`
-	SellerRealName string    `description:"销售员名称"`
-	Status         string    `description:"产品权限状态"`
-	ProductId      int       `description:"产品id"`
-	Mobile         string    `description:"手机号"`
-	Email          string    `description:"邮箱"`
-	ModifyTime     time.Time `description:"修改时间"`
-	CreateTime     time.Time `description:"创建时间"`
-}
-
-func GetUserGroupSellerByUserId(userId int) (item *UserSellerRelationGroup, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,GROUP_CONCAT(DISTINCT b.real_name SEPARATOR '/') AS seller_real_name,GROUP_CONCAT(DISTINCT c.status SEPARATOR '/') AS status
-			FROM user_seller_relation AS a
-			LEFT  JOIN admin AS b ON a.seller_id=b.admin_id
-			LEFT  JOIN company_product AS c ON a.company_id=c.company_id
-			WHERE a.user_id=? GROUP BY a.company_id`
-	err = o.Raw(sql, userId).QueryRow(&item)
-	return
-}
-
-//根据联系人id获所有的分组信息
-func GetUserGroupSellersByUserId(userId int) (list []*UserSellerRelationGroup, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.real_name AS seller_real_name,c.status  
-			FROM user_seller_relation AS a
-			LEFT  JOIN admin AS b ON a.seller_id=b.admin_id
-			LEFT  JOIN company_product AS c ON a.company_id=c.company_id
-			WHERE a.user_id=? `
-	_, err = o.Raw(sql, userId).QueryRows(&list)
-	return
-}

models/user_template_record.go

@@ -1,31 +0,0 @@
-package models
-
-import "github.com/beego/beego/v2/client/orm"
-
-type UserTemplateRecord struct {
-	Id         int `orm:"column(id);pk"`
-	UserId     int
-	OpenId     string
-	Resource   string
-	SendData   string
-	Result     string
-	CreateDate string
-	CreateTime string
-	SendStatus int
-	SendType   int
-}
-
-//添加banner
-func AddUserTemplateRecord(item *UserTemplateRecord) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(item)
-	return
-}
-
-//GeUserTemplateRecordListBysendType 根据模板消息会议类型，获取已推送的用户的信息
-func GeUserTemplateRecordListBysendType(sendType int, resource string) (items []*UserTemplateRecord, err error) {
-	sql := `SELECT * FROM user_template_record WHERE send_type = ? AND resource = ? `
-	o := orm.NewOrm()
-	_, err = o.Raw(sql, sendType, resource).QueryRows(&items)
-	return
-}

models/user_view_history.go

@@ -12,7 +12,7 @@ type ResearchReportViewPUV struct {
 
 // GetPUVByResearchReportIds 通过报告IDs获取老报告PV、UV
 func GetPUVByResearchReportIds(reportIds string) (list []*ResearchReportViewPUV, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT
 				research_report_id,
 				COUNT(1) AS pv,

models/variety_tag.go

@@ -16,7 +16,7 @@ type VarietyClassify struct {
 }
 
 func (varietyClassify *VarietyClassify) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	lastId, err = o.Insert(varietyClassify)
 	if err != nil {
 		return
@@ -26,14 +26,14 @@ func (varietyClassify *VarietyClassify) Add() (lastId int64, err error) {
 }
 
 func (varietyClassify *VarietyClassify) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(varietyClassify, cols...)
 	return
 }
 
 // GetEnableVarietyClassifyList 获取启用的标签分类列表
 func GetEnableVarietyClassifyList(hasForbidden bool) (list []*VarietyClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ""
 	if hasForbidden {
 		sql = `SELECT * FROM variety_classify ORDER BY sort ASC`
@@ -47,7 +47,7 @@ func GetEnableVarietyClassifyList(hasForbidden bool) (list []*VarietyClassify, e
 
 // GetVarietyClassifyPageList 获取标签分类分页列表
 func GetVarietyClassifyPageList(condition string, pars []interface{}, orderRule string, startSize, pageSize int) (total int, list []*VarietyClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM variety_classify WHERE 1=1 `
 	sql += condition
 	if orderRule == "" {
@@ -67,7 +67,7 @@ func GetVarietyClassifyPageList(condition string, pars []interface{}, orderRule
 
 // GetVarietyClassifyById 主键获取分类
 func GetVarietyClassifyById(classifyId int) (item *VarietyClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM variety_classify WHERE variety_classify_id = ? LIMIT 1`
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return
@@ -75,7 +75,7 @@ func GetVarietyClassifyById(classifyId int) (item *VarietyClassify, err error) {
 
 // GetVarietyClassifyByName 名称获取分类
 func GetVarietyClassifyByName(classifyName string) (item *VarietyClassify, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM variety_classify WHERE classify_name = ? LIMIT 1`
 	err = o.Raw(sql, classifyName).QueryRow(&item)
 	return
@@ -83,7 +83,7 @@ func GetVarietyClassifyByName(classifyName string) (item *VarietyClassify, err e
 
 // GetCountEnableClassifyByClassifyId 根据分类ID获取启用分类数
 func GetCountEnableClassifyByClassifyId(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT COUNT(1) FROM variety_classify WHERE state = 1 AND variety_classify_id != ?`
 	err = o.Raw(sql, classifyId).QueryRow(&count)
 	return
@@ -105,7 +105,7 @@ type VarietyTag struct {
 }
 
 func (varietyTag *VarietyTag) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	lastId, err = o.Insert(varietyTag)
 	if err != nil {
 		return
@@ -115,14 +115,14 @@ func (varietyTag *VarietyTag) Add() (lastId int64, err error) {
 }
 
 func (varietyTag *VarietyTag) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(varietyTag, cols...)
 	return
 }
 
 // GetVarietyTagById 主键获取标签
 func GetVarietyTagById(tagId int) (item *VarietyTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM variety_tag WHERE variety_tag_id = ? LIMIT 1`
 	err = o.Raw(sql, tagId).QueryRow(&item)
 	return
@@ -130,7 +130,7 @@ func GetVarietyTagById(tagId int) (item *VarietyTag, err error) {
 
 // GetCountEnableTagByTagId 根据标签ID获取启用标签数
 func GetCountEnableTagByTagId(classifyId int) (count int, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT COUNT(1) FROM variety_tag WHERE state = 1 AND variety_tag_id != ?`
 	err = o.Raw(sql, classifyId).QueryRow(&count)
 	return
@@ -138,11 +138,11 @@ func GetCountEnableTagByTagId(classifyId int) (count int, err error) {
 
 // GetEnableVarietyTagList 获取启用状态标签列表
 func GetEnableVarietyTagList(hasForbidden bool) (list []*VarietyTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	var sql string
 	if hasForbidden {
 		sql = `SELECT * FROM variety_tag ORDER BY sort`
-	}else {
+	} else {
 		sql = `SELECT * FROM variety_tag WHERE state = 1 ORDER BY sort`
 	}
 
@@ -152,7 +152,7 @@ func GetEnableVarietyTagList(hasForbidden bool) (list []*VarietyTag, err error)
 
 // GetVarietyTagList 获取标签列表
 func GetVarietyTagList() (list []*VarietyTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM variety_tag ORDER BY sort`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -160,7 +160,7 @@ func GetVarietyTagList() (list []*VarietyTag, err error) {
 
 // GetVarietyTagPageList 获取标签分页列表
 func GetVarietyTagPageList(condition string, pars []interface{}, orderRule string, startSize, pageSize int) (total int, list []*VarietyTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM variety_tag WHERE 1=1 `
 	sql += condition
 	if orderRule == "" {
@@ -180,7 +180,7 @@ func GetVarietyTagPageList(condition string, pars []interface{}, orderRule strin
 
 // GetVarietyTagListByClassifyId 根据分类获取标签列表
 func GetVarietyTagListByClassifyId(classifyId int) (list []*VarietyTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM variety_tag WHERE variety_classify_id = ? AND state = 1 ORDER BY sort`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -195,7 +195,7 @@ type ResearchVarietyTagRelation struct {
 
 // ResearchVarietyTagRelationListByAdminId 根据研究员ID获取标签关系列表
 func ResearchVarietyTagRelationListByAdminId(adminId int) (list []*ResearchVarietyTagRelation, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM research_variety_tag_relation WHERE admin_id = ?`
 	_, err = o.Raw(sql, adminId).QueryRows(&list)
 	return
@@ -209,7 +209,7 @@ type ResearchTagRelation struct {
 
 // ResearchTagRelationListByAdminId 根据研究员ID获取标签关系列表
 func ResearchTagRelationListByAdminId(adminId int) (list []*ResearchTagRelation, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT id, variety_tag_id AS research_group_id, admin_id FROM research_variety_tag_relation WHERE admin_id = ?`
 	_, err = o.Raw(sql, adminId).QueryRows(&list)
 	return
@@ -229,7 +229,7 @@ func GetResearchVarietyTagRelationList(include int) (list []*ResearchVarietyTagR
 	if include == 1 {
 		condition = ` WHERE 1=1 `
 	}
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT
 				a.variety_tag_id,
 				a.admin_id,
@@ -247,7 +247,7 @@ func GetResearchVarietyTagRelationList(include int) (list []*ResearchVarietyTagR
 
 // UpdateAdminVarietyTagRelation 更新研究员标签关系
 func UpdateAdminVarietyTagRelation(adminId int, items []*ResearchVarietyTagRelation) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -278,7 +278,7 @@ type AdminVarietyTagRelationList struct {
 
 // GetAdminVarietyTagRelationListByAdminId 获取研究员研究方向分组列表
 func GetAdminVarietyTagRelationListByAdminId(adminIds string) (list []*AdminVarietyTagRelationList, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT
 				a.admin_id,
 				GROUP_CONCAT(b.tag_name) AS group_name_str

models/wechat.go

@@ -1,144 +0,0 @@
-package models
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/beego/beego/v2/client/orm"
-	"github.com/rdlucklib/rdluck_tools/http"
-	"hongze/hz_eta_api/utils"
-	"time"
-)
-
-type WxToken struct {
-	AccessToken string
-	ExpiresIn   int64
-	Id          int64
-}
-
-func GetWxAccessToken() (accessTokenStr string, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM wx_token LIMIT 1`
-	wxToken := new(WxToken)
-	err = o.Raw(sql).QueryRow(&wxToken)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		utils.FileLog.Info("Get wxToken Err:", err.Error())
-		return
-	}
-	//Token不存在
-	if wxToken == nil {
-		fmt.Println("wxToken is empty")
-		accessToken, err := GetWxToken(utils.WxAppId, utils.WxAppSecret)
-		if err != nil {
-			return "", err
-		}
-		if accessToken.AccessToken != "" {
-			expiresIn := time.Now().Add(time.Duration(accessToken.ExpiresIn) * time.Second).Unix()
-			addSql := "insert into wx_token (access_token,expires_in) values (?,?)"
-			_, err = o.Raw(addSql, accessToken.AccessToken, expiresIn).Exec()
-			accessTokenStr = accessToken.AccessToken
-		}
-		return accessTokenStr, err
-	} else {
-		//判断token是否过期
-		if time.Now().Unix() > wxToken.ExpiresIn {
-			accessToken, err := GetWxToken(utils.WxAppId, utils.WxAppSecret)
-			if err != nil {
-				return "", err
-			}
-			if accessToken.AccessToken != "" {
-				expiresIn := time.Now().Add(time.Duration(accessToken.ExpiresIn) * time.Second).Unix()
-				updateSql := "update wx_token set access_token = ?,expires_in = ? "
-				_, err = o.Raw(updateSql, accessToken.AccessToken, expiresIn).Exec()
-				accessTokenStr = accessToken.AccessToken
-				fmt.Println("更新 TOKEN:", err)
-			}
-			return accessTokenStr, err
-		} else {
-			return wxToken.AccessToken, nil
-		}
-	}
-	return
-}
-
-type WxAccessToken struct {
-	AccessToken string `json:"access_token"`
-	ExpiresIn   int    `json:"expires_in"`
-	Errcode     int    `json:"errcode"`
-	Errmsg      string `json:"errmsg"`
-}
-
-func GetWxToken(wxAppId, wxAppSecret string) (item *WxAccessToken, err error) {
-	getUrl := "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + wxAppId + "&secret=" + wxAppSecret
-	result, err := http.Get(getUrl)
-	if err != nil {
-		utils.FileLog.Info("GetWxToken Err:", err.Error())
-		return
-	}
-	err = json.Unmarshal(result, &item)
-	if err != nil {
-		fmt.Println(fmt.Sprintf("GetWxToken Unmarshal Err:%s", err.Error()))
-		return
-	}
-	if item.Errmsg != "" {
-		utils.FileLog.Info(fmt.Sprintf("GetWxToken fail result:%s", string(result)))
-	}
-	return
-}
-
-type WxUsers struct {
-	WxBase
-	Total int
-	Count int
-	Data  struct {
-		Openid []string
-	}
-	NextOpenid string `json:"next_openid"`
-}
-
-// 微信接口基础返回数据
-type WxBase struct {
-	Errcode int
-	Errmsg  string
-}
-
-func WxUsersGetV1() (openIdList []string) {
-	accessToken, err := GetWxAccessToken()
-	if err != nil {
-		utils.FileLog.Info("GetWxAccessToken Err:%s", err.Error())
-		return nil
-	}
-
-	//关注的openid切片
-	openIdList = make([]string, 0)
-	//下一个openid
-	nextOpenid := ""
-
-QUERY_WX:
-	url := "https://api.weixin.qq.com/cgi-bin/user/get?access_token=" + accessToken + "&next_openid=" + nextOpenid
-	result, err := http.Get(url)
-	if err != nil {
-		utils.FileLog.Info("GetUser Err:", err.Error())
-		return
-	}
-	item := new(WxUsers)
-	err = json.Unmarshal(result, &item)
-	if err != nil {
-		fmt.Println("Unmarshal Err:", err.Error())
-		return
-	}
-	if item.Errcode != 0 {
-		utils.FileLog.Info("微信接口返回异常 Err：", item.Errmsg)
-		return
-	}
-	err = errors.New(item.Errmsg)
-
-	openIdList = append(openIdList, item.Data.Openid...)
-
-	//如果数量大于10000条，同时下个openid不为空，那么继续查询
-	if item.Count >= 10000 && item.NextOpenid != "" {
-		nextOpenid = item.NextOpenid
-		goto QUERY_WX
-	}
-	return openIdList
-}

models/wechat_send_msg.go

@@ -2,8 +2,6 @@ package models
 
 import (
 	"github.com/beego/beego/v2/client/orm"
-	"hongze/hz_eta_api/utils"
-	"strings"
 )
 
 type OpenIdList struct {
@@ -11,238 +9,6 @@ type OpenIdList struct {
 	UserId int
 }
 
-func GetOpenIdList() (items []*OpenIdList, err error) {
-	//openIdstr := WxUsersGet()
-	//sql:=` SELECT DISTINCT open_id FROM wx_user AS wu
-	//      INNER JOIN company AS c ON c.company_id = wu.company_id
-	//      INNER JOIN company_product AS d ON c.company_id=d.company_id
-	//      WHERE wu.open_id IS NOT NULL AND  d.status IN('正式','试用','永续') `
-	sql := `SELECT DISTINCT ur.open_id,wu.user_id FROM wx_user AS wu 
-          INNER JOIN company AS c ON c.company_id = wu.company_id 
-          INNER JOIN company_product AS d ON c.company_id=d.company_id
-		INNER join user_record  as ur on wu.user_id=ur.user_id
-          WHERE ur.open_id != "" AND ur.subscribe=1 and ur.create_platform=1 AND  d.status IN('正式','试用','永续') `
-	//if openIdstr != "" {
-	//	sql += ` AND ur.open_id in (` + openIdstr + `) `
-	//}
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetOpenIdListByMobile(mobile string) (items []*OpenIdList, err error) {
-	//openIdstr := WxUsersGet()
-	sql := `SELECT DISTINCT ur.open_id,wu.user_id FROM wx_user AS wu 
-          INNER JOIN company AS c ON c.company_id = wu.company_id 
-          INNER join user_record  as ur on wu.user_id=ur.user_id
-          WHERE ur.open_id != "" AND ur.subscribe=1 and ur.create_platform=1 AND wu.mobile=? `
-	//if openIdstr != "" {
-	//	sql += ` AND ur.open_id in (` + openIdstr + `) `
-	//}
-	_, err = orm.NewOrm().Raw(sql, mobile).QueryRows(&items)
-	return
-}
-
-// 获取预约活动的用户的openID
-func GetActivityOpenIdList(activityId int) (items []*OpenIdList, err error) {
-	sql := `SELECT DISTINCT cr.open_id,u.user_id
-			FROM
-			cygx_my_schedule AS m
-			INNER JOIN user_record AS u ON u.bind_account = m.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE m.activity_id = ? AND u.create_platform = 4 `
-	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
-	return
-}
-
-// 获取预约活动的用户的openID测试环境
-func GetActivityOpenIdListByDeBug(activityId int) (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_my_schedule AS s
-			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-		WHERE
-			s.activity_id = ? 
-			AND u.create_platform = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql, activityId).QueryRows(&items)
-	return
-}
-
-// 获取预约活动的用户的openID
-func GetActivitySpecialOpenIdList() (items []*OpenIdList, err error) {
-	sql := `SELECT DISTINCT cr.open_id,u.user_id
-			FROM
-			cygx_user_follow_special AS m
-			INNER JOIN user_record AS u ON u.bind_account = m.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE  u.create_platform = 4 `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-	return
-}
-
-// 获取预约活动的用户的openID测试环境
-func GetActivitySpecialOpenIdListByDeBug() (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_user_follow_special AS s
-			INNER JOIN wx_user AS wx ON wx.user_id = s.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-		WHERE
-			u.create_platform = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-	return
-}
-
-// 获取关注作者的用户的openID
-func GetFollowDepartmentOpenIdList(departmentId int) (items []*OpenIdList, err error) {
-	sql := `SELECT cr.open_id,u.user_id
-			FROM
-				cygx_article_department_follow AS f
-				INNER JOIN user_record AS u ON u.bind_account = f.mobile
-				INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
-				INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-				INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE
-				f.department_id = ?
-				AND u.create_platform = 4 
-				AND f.type = 1 
-				AND p.status IN ('正式','试用','永续')
-			GROUP BY
-				cr.open_id `
-	_, err = orm.NewOrm().Raw(sql, departmentId).QueryRows(&items)
-	return
-}
-
-// 获取关注作者的用户的openID测试环境
-func GetFollowDepartmentOpenIdListByDeBug(departmentId int) (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_article_department_follow AS f
-			INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-			INNER JOIN company_product AS p ON p.company_id = wx.company_id
-		WHERE
-			f.department_id = ? 
-			AND u.create_platform = 1
-			AND f.type = 1 
-			AND p.STATUS IN ( '正式', '试用', '永续' ) 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql, departmentId).QueryRows(&items)
-	return
-}
-
-// 获取关注产业的用户的openID
-func GetFollowindustrialOpenIdList(industrialManagementId int) (items []*OpenIdList, err error) {
-	sql := `SELECT cr.open_id,u.user_id
-			FROM
-			cygx_industry_fllow AS f
-			INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			WHERE
-			f.industrial_management_id = ? 
-			AND u.create_platform = 4 
-			AND f.type = 1 GROUP BY cr.open_id `
-	_, err = orm.NewOrm().Raw(sql, industrialManagementId).QueryRows(&items)
-	return
-}
-
-// 获取关注产业的用户的openID 测试环境
-func GetFollowindustrialOpenIdListByDeBug(industrialManagementId int) (items []*OpenIdList, err error) {
-	sql := `SELECT
-			u.open_id,
-			u.user_id 
-		FROM
-			cygx_industry_fllow AS f
-			INNER JOIN wx_user AS wx ON wx.user_id = f.user_id
-			INNER JOIN user_record AS u ON u.bind_account = wx.mobile
-		WHERE
-			f.industrial_management_id = ? 
-			AND u.create_platform = 1 
-			AND u.bind_account != ""
-			AND f.type = 1 
-		GROUP BY
-			u.open_id`
-	_, err = orm.NewOrm().Raw(sql, industrialManagementId).QueryRows(&items)
-	return
-}
-
-// GetUserOpenidListByUserIds 根据用户id字符串集合来获取他的openid列表集合
-func GetUserOpenidListByUserIds(userIdStr []string) (list []*OpenIdList, err error) {
-	if len(userIdStr) <= 0 {
-		return
-	}
-	sql := `SELECT open_id,u.user_id FROM user_record WHERE user_id in (` + strings.Join(userIdStr, ",") + `) and create_platform = 1`
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&list)
-	return
-}
-
-func GetAdminOpenIdByMobile(mobile string) (items []*OpenIdList, err error) {
-	sql := `SELECT DISTINCT ur.open_id,wu.user_id FROM wx_user AS wu 
-          INNER JOIN company AS c ON c.company_id = wu.company_id 
-          INNER join user_record  as ur on wu.user_id=ur.user_id
-          WHERE ur.open_id != "" and ur.create_platform=1 AND wu.mobile=? `
-	_, err = orm.NewOrm().Raw(sql, mobile).QueryRows(&items)
-	return
-}
-
-// 根据手机号获取用户的openid查研观向小助手专用
-func GetUserRecordListByMobile(platform int, bindAccount string) (items []*OpenIdList, err error) {
-	var sql string
-	if utils.RunMode == "release" {
-		sql = `SELECT cr.open_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 + `)`
-	} else {
-		platform = 1
-		sql = `SELECT open_id FROM	user_record  WHERE create_platform =? AND bind_account IN (` + bindAccount + `)`
-	}
-	_, err = orm.NewOrm().Raw(sql, platform).QueryRows(&items)
-	return
-}
-
-// 获取单个用户openid
-func GetCompanyDetailByIdGroup(platform int, bindAccount string) (item *OpenIdList, err error) {
-	o := orm.NewOrm()
-	var sql string
-	sql = `SELECT cr.open_id,wu.user_id FROM user_record  as u 
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = u.union_id 
-			INNER JOIN wx_user AS wu ON wu.mobile = u.bind_account 
-			WHERE create_platform=? AND u.bind_account = ?`
-	err = o.Raw(sql, platform, bindAccount).QueryRow(&item)
-	return
-}
-
-// 获取小助手所有的用户的openid
-func GetCygxUserAllOpneid() (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			cr.open_id,
-			r.user_id 
-		FROM
-			user_record AS r
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
-		WHERE
-			r.create_platform = 4`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 func GetOpenIdArr() (items []string, err error) {
 	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu 
           INNER JOIN company AS c ON c.company_id = wu.company_id 
@@ -250,182 +16,7 @@ func GetOpenIdArr() (items []string, err error) {
 		INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
           WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
          ORDER BY FIELD(c.company_id, 16) desc, ur.user_record_id asc`
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-	return
-}
-
-// 获取预约活动的用户的openID测试环境
-func GetActivitySpecialOpenIdListMobile(condition string, pars []interface{}) (items []*OpenIdList, err error) {
-	sql := `SELECT
-			cr.open_id,
-			u.user_id
-		FROM
-			company_report_permission AS p
-			INNER JOIN wx_user AS u ON u.company_id = p.company_id
-			INNER JOIN user_record AS r ON r.user_id = u.user_id
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
-		WHERE
-			 r.create_platform = 4  AND p.STATUS IN ('正式','试用','永续')  ` + condition + ` GROUP BY cr.open_id`
-	_, err = orm.NewOrm().Raw(sql, pars).QueryRows(&items)
-	return
-}
-
-// 获取所有关注了该产业用户的openid
-func GetCygxUserIndustryFllowOpneid(IndustrialManagementId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-			cr.open_id,
-			r.user_id 
-		FROM
-			user_record AS r
-			INNER JOIN cygx_user_record AS cr ON cr.union_id = r.union_id 
-			INNER join cygx_industry_fllow  as cf on cf.user_id = r.user_id 
-		WHERE
-			r.create_platform = 4
-			AND cf.industrial_management_id = ?`
-	_, err = o.Raw(sql, IndustrialManagementId).QueryRows(&items)
-	return
-}
-
-// 获取所有关注了该产业用户的openid
-func GetCygxUserIndustryFllowOpneidByActivityIds(activityId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `			
-SELECT
-	cr.open_id,
-	r.user_id 
-FROM
-	cygx_industrial_activity_group_management AS agm
-	INNER JOIN cygx_industry_fllow AS f ON f.industrial_management_id = agm.industrial_management_id
-	INNER JOIN user_record AS r
-	INNER JOIN cygx_user_record AS cr 
-WHERE
-	agm.activity_id = ? 
-	AND cr.union_id = r.union_id 
-	AND r.create_platform = 4 
-	AND r.user_id = f.user_id;`
-	_, err = o.Raw(sql, activityId).QueryRows(&items)
-	return
-}
-
-// 获取所有关注了该产业永续客户的openid
-func GetCygxForeverUserIndustryFllowOpneidByActivityIds(activityId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `			
-SELECT
-	cr.open_id,
-	r.user_id 
-FROM
-	cygx_industrial_activity_group_management AS agm
-	INNER JOIN cygx_industry_fllow AS f ON f.industrial_management_id = agm.industrial_management_id
-	INNER JOIN user_record AS r
-	INNER JOIN cygx_user_record AS cr 
-	INNER JOIN wx_user AS wx ON wx.user_id = r.user_id 
-	INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-WHERE
-	agm.activity_id = ? 
-	AND cr.union_id = r.union_id 
-	AND r.create_platform = 4 
-	AND r.user_id = f.user_id
-	AND p.status = "永续";`
-	_, err = o.Raw(sql, activityId).QueryRows(&items)
-	return
-}
-
-// 获取所有关注了该产业试用客户的openid
-func GetCygxTryOutUserIndustryFllowOpneidByActivityIds(activityId int) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `			
-SELECT
-	cr.open_id,
-	r.user_id 
-FROM
-	cygx_industrial_activity_group_management AS agm
-	INNER JOIN cygx_industry_fllow AS f ON f.industrial_management_id = agm.industrial_management_id
-	INNER JOIN user_record AS r
-	INNER JOIN cygx_user_record AS cr 
-	INNER JOIN wx_user AS wx ON wx.user_id = r.user_id 
-	INNER JOIN company_product AS p ON p.company_id = wx.company_id 
-WHERE
-	agm.activity_id = ? 
-	AND cr.union_id = r.union_id 
-	AND r.create_platform = 4 
-	AND r.user_id = f.user_id
-	AND p.status = "试用";`
-	_, err = o.Raw(sql, activityId).QueryRows(&items)
-	return
-}
-
-// 获取所有关注了该产业用户的companyIds
-func GetCygxIndustryFollowCompanyIdsByActivityId(activityId int) (item *string, err error) {
-	o := orm.NewOrm()
-	sql := `			
-SELECT
-	GROUP_CONCAT( DISTINCT f.company_id SEPARATOR ',' ) AS company_ids
-FROM
-	cygx_industrial_activity_group_management AS agm
-	INNER JOIN cygx_industry_fllow AS f ON f.industrial_management_id = agm.industrial_management_id
-	INNER JOIN user_record AS r
-	INNER JOIN cygx_user_record AS cr 
-WHERE
-	agm.activity_id = ? 
-	AND r.create_platform = 4 
-	AND r.user_id = f.user_id;`
-	err = o.Raw(sql, activityId).QueryRow(&item)
-	return
-}
-
-// 获取所有关注了该产业用户的openidBy公司id
-func GetCygxUserIndustryFllowOpneidByActivityIdAndCompanyIds(activityId int, companyIds string) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `			
-SELECT
-	cr.open_id,
-	r.user_id 
-FROM
-	cygx_industrial_activity_group_management AS agm
-	INNER JOIN cygx_industry_fllow AS f ON f.industrial_management_id = agm.industrial_management_id
-	INNER JOIN user_record AS r
-	INNER JOIN cygx_user_record AS cr 
-WHERE
-	agm.activity_id = ? 
-	AND cr.union_id = r.union_id 
-	AND r.create_platform = 4 
-	AND r.user_id = f.user_id
-	AND f.company_id IN (` + companyIds + `);`
-	_, err = o.Raw(sql, activityId).QueryRows(&items)
-	return
-}
-
-// 获取所有互动过的用户id
-func GetCygxInteractiveUserByActivityId(activityId int) (items []*int, err error) {
-	o := orm.NewOrm()
-	sql := `			
-SELECT user_id FROM cygx_activity_signup WHERE activity_id =? AND fail_type = 0
-UNION ALL
-SELECT user_id FROM cygx_activity_appointment WHERE activity_id = ?
-UNION ALL
-SELECT user_id FROM cygx_activity_meeting_reminder WHERE activity_id = ?
-UNION ALL
-SELECT user_id FROM cygx_activity_help_ask  WHERE activity_id = ? `
-	_, err = o.Raw(sql, activityId, activityId, activityId, activityId).QueryRows(&items)
-	return
-}
-
-// 获取所有用户的openid
-func GetCygxUserOpneidByUserIds(userIds string) (items []*OpenIdList, err error) {
-	o := orm.NewOrm()
-	sql := `			
-SELECT
-	cr.open_id,
-	r.user_id 
-FROM
-	user_record AS r
-	INNER JOIN cygx_user_record AS cr 
-WHERE
-	cr.union_id = r.union_id 
-	AND r.create_platform = 4 
-	AND r.user_id IN (` + userIds + `);`
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -442,35 +33,7 @@ func GetOpenIdArrByClassifyNameSecond(classifyNameSecond string) (items []string
 			AND g.from='rddp'
 			AND g.key_word=?
 			ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-	_, err = orm.NewOrm().Raw(sql, classifyNameSecond).QueryRows(&items)
-	return
-}
-
-func GetOpenIdArrByChartPermissionIds(chartPermissionIds string) (items []string, err error) {
-	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu 
-INNER JOIN company AS c ON c.company_id = wu.company_id 
-INNER JOIN company_product AS d ON c.company_id=d.company_id
-INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-INNER JOIN company_report_permission AS e ON d.company_id=e.company_id
-INNER JOIN chart_permission AS f ON e.chart_permission_id=f.chart_permission_id
-WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
-AND f.chart_permission_id IN(` + chartPermissionIds + `)
-ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
-	return
-}
-
-func GetOpenIdArrByVarietyTag(varietyTagId int) (items []string, err error) {
-	sql := ` SELECT DISTINCT ur.open_id FROM wx_user AS wu 
-INNER JOIN company AS c ON c.company_id = wu.company_id 
-INNER JOIN company_product AS d ON c.company_id=d.company_id
-INNER JOIN user_record  AS ur ON wu.user_id=ur.user_id
-INNER JOIN company_report_permission AS e ON d.company_id=e.company_id
-INNER JOIN chart_permission AS f ON e.chart_permission_id=f.chart_permission_id
-INNER JOIN variety_tag AS g ON f.chart_permission_id=g.chart_permission_id
-WHERE ur.open_id != "" AND ur.subscribe=1 AND ur.create_platform=1 AND  d.status IN('正式','试用','永续')
-AND g.variety_tag_id=?
-ORDER BY FIELD(c.company_id, 16) DESC, ur.user_record_id ASC  `
-	_, err = orm.NewOrm().Raw(sql, varietyTagId).QueryRows(&items)
+	o := orm.NewOrmUsingDB("weekly")
+	_, err = o.Raw(sql, classifyNameSecond).QueryRows(&items)
 	return
 }

models/wx_user.go

@@ -34,13 +34,13 @@ type WxUser struct {
 }
 
 func AddWxUser(item *WxUser) (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	lastId, err = o.Insert(item)
 	return
 }
 
 func GetWxUserByMobile(mobile string) (item *WxUser, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM wx_user WHERE mobile = ? LIMIT 1`
 	err = o.Raw(sql, mobile).QueryRow(&item)
 	return
@@ -48,7 +48,7 @@ func GetWxUserByMobile(mobile string) (item *WxUser, err error) {
 
 // GetWxUserByMobileCountryCode 根据手机号和区号获取用户信息
 func GetWxUserByMobileCountryCode(mobile, countryCode string) (item *WxUser, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM wx_user WHERE mobile = ? `
 	sql += ` and country_code in ("","` + countryCode + `") `
 	sql += ` LIMIT 1 `
@@ -57,7 +57,7 @@ func GetWxUserByMobileCountryCode(mobile, countryCode string) (item *WxUser, err
 }
 
 func GetWxUserByUserId(userId int) (item *WxUser, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM wx_user WHERE user_id=? `
 	err = o.Raw(sql, userId).QueryRow(&item)
 	return
@@ -65,7 +65,7 @@ func GetWxUserByUserId(userId int) (item *WxUser, err error) {
 
 // 更新wxUser信息
 func (wxUser *WxUser) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(wxUser, cols...)
 	return
 }
@@ -95,7 +95,7 @@ type PotentialUserListResp struct {
 
 // GetWxUserByCompanyIdAndMobile 根据客户ID及手机号获取用户
 func GetWxUserByCompanyIdAndMobile(companyId int, mobile string) (item *WxUser, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` SELECT * FROM wx_user WHERE company_id = ? AND mobile = ? LIMIT 1 `
 	err = o.Raw(sql, companyId, mobile).QueryRow(&item)
 	return
@@ -103,7 +103,7 @@ func GetWxUserByCompanyIdAndMobile(companyId int, mobile string) (item *WxUser,
 
 // DeleteWxUserAndRecordByUserId 删除用户及第三方信息
 func DeleteWxUserAndRecordByUserId(userId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	to, err := o.Begin()
 	if err != nil {
 		return
@@ -130,7 +130,7 @@ func DeleteWxUserAndRecordByUserId(userId int) (err error) {
 
 // 获取这个公司下面所有用户的手机号
 func SetUserSubscribe(openId string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := ` UPDATE user_record SET subscribe=1,subscribe_time=NOW() WHERE open_id=? `
 	_, err = o.Raw(sql, openId).Exec()
 	return

models/yb/price_driven.go

@@ -33,7 +33,7 @@ func (priceDrivenInfo *PriceDriven) TableName() string {
 
 // Add 新增
 func (priceDrivenInfo *PriceDriven) Add() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	id, err := o.Insert(priceDrivenInfo)
 	if err != nil {
 		return
@@ -44,7 +44,7 @@ func (priceDrivenInfo *PriceDriven) Add() (err error) {
 
 // Update 更新
 func (priceDrivenInfo *PriceDriven) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(priceDrivenInfo, cols...)
 	return
 }
@@ -71,7 +71,7 @@ func (priceDrivenSaveLogInfo *PriceDrivenSaveLog) TableName() string {
 
 // Add 新增保存记录
 func (priceDrivenSaveLogInfo *PriceDrivenSaveLog) Add() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	lastId, err := o.Insert(priceDrivenSaveLogInfo)
 	if err != nil {
 		return

models/yb/price_driven_tag.go

@@ -22,7 +22,7 @@ func (priceDrivenTag *PriceDrivenTag) TableName() string {
 
 // Add 新增
 func (priceDrivenTag *PriceDrivenTag) Add() (lastId int64, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	lastId, err = o.Insert(priceDrivenTag)
 	if err != nil {
 		return
@@ -33,14 +33,14 @@ func (priceDrivenTag *PriceDrivenTag) Add() (lastId int64, err error) {
 
 // Update 更新
 func (priceDrivenTag *PriceDrivenTag) Update(cols []string) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	_, err = o.Update(priceDrivenTag, cols...)
 	return
 }
 
 // GetPriceDrivenTagList 获取价格驱动标签列表
 func GetPriceDrivenTagList() (list []*PriceDrivenTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM yb_price_driven_tag`
 	_, err = o.Raw(sql).QueryRows(&list)
 	return
@@ -48,7 +48,7 @@ func GetPriceDrivenTagList() (list []*PriceDrivenTag, err error) {
 
 // GetPriceDrivenTagByTagId 通过标签ID获取价格驱动标签
 func GetPriceDrivenTagByTagId(tagId int) (item *PriceDrivenTag, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM yb_price_driven_tag WHERE variety_tag_id = ? LIMIT 1`
 	err = o.Raw(sql, tagId).QueryRow(&item)
 	return

models/yb/yb_community_question_process.go

@@ -33,7 +33,7 @@ func (item *CommunityQuestionProcess) TableName() string {
 }
 
 func (item *CommunityQuestionProcess) Create() (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	id, err := o.Insert(item)
 	if err != nil {
 		return
@@ -61,7 +61,7 @@ type CommunityQuestionProcessItem struct {
 // GetCommunityQuestionProcessItemList 根据问答ID获取流程
 func GetCommunityQuestionProcessItemList(questionId int) (list []*CommunityQuestionProcessItem, err error) {
 	list = make([]*CommunityQuestionProcessItem, 0)
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("weekly")
 	sql := `SELECT * FROM yb_community_question_process WHERE community_question_id = ? ORDER BY create_time DESC`
 	_, err = o.Raw(sql, questionId).QueryRows(&list)
 	return

services/wechat.go

@@ -1,22 +0,0 @@
-package services
-
-import (
-	"fmt"
-	"hongze/hz_eta_api/models"
-	"time"
-)
-
-// 获取所有关注公众号的用户open_id
-func GetWxUsersSubscribe() {
-	openIdList := models.WxUsersGetV1()
-	fmt.Println("openIdList:", len(openIdList))
-	time.Sleep(3 * time.Second)
-	for _, v := range openIdList {
-		fmt.Println("openId:" + v)
-		err := models.SetUserSubscribe(v)
-		if err != nil {
-			fmt.Println("SetUserSubscribe Err:" + err.Error())
-			return
-		}
-	}
-}

utils/config.go

@@ -9,13 +9,14 @@ import (
 )
 
 var (
-	RunMode        string //运行模式
-	MYSQL_URL      string //数据库连接
-	MYSQL_URL_RDDP string //数据库连接
-	MYSQL_URL_EDB  string
-	MYSQL_URL_DATA string
-	MYSQL_URL_GL   string
-	MYSQL_LOG_URL  string
+	RunMode          string //运行模式
+	MYSQL_URL        string //数据库连接
+	MYSQL_URL_RDDP   string //数据库连接
+	MYSQL_URL_EDB    string
+	MYSQL_URL_DATA   string
+	MYSQL_URL_GL     string
+	MYSQL_LOG_URL    string
+	MYSQL_WEEKLY_URL string //用户主库
 
 	REDIS_CACHE string       //缓存地址
 	Rc          *cache.Cache //redis缓存
@@ -195,6 +196,9 @@ func init() {
 	MYSQL_URL_GL = config["mysql_url_gl"]
 	MYSQL_LOG_URL = config["mysql_url_log"]
 
+	// 用户主库
+	MYSQL_WEEKLY_URL = config["mysql_url_weekly"]
+
 	REDIS_CACHE = config["beego_cache"]
 	if len(REDIS_CACHE) <= 0 {
 		panic(any("redis链接参数没有配置"))