fix：修复客户到期提醒通知、调整表注册逻辑

models/company_product.go

@@ -200,12 +200,14 @@ type Sellers struct {
 
 func GetSellers() (items []*Sellers, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT a.real_name,a.email,b.open_id,a.mobile,b.mobile,a.role_type_code,a.admin_id
+	sql := `SELECT a.real_name,a.email,c.open_id,a.mobile,b.mobile,a.role_type_code,a.admin_id
            FROM admin AS a
 			LEFT JOIN wx_user AS b ON a.mobile=b.mobile
 			LEFT JOIN user_record AS c ON b.user_id=c.user_id
-			WHERE role_type_code IN('ficc_seller','ficc_admin','rai_seller','rai_admin')
-			AND c.open_id<>'' and c.create_platform=1`
+			WHERE role_type_code IN('ficc_seller','ficc_group','ficc_team','rai_seller','rai_group')
+			and (
+				(a.email != "") or ( c.open_id<>'' and c.create_platform=1)
+			)`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }

models/db.go

@@ -53,50 +53,80 @@ func init() {
 	//注册对象
 	orm.RegisterModel(
 		new(EdbinfoSendMsgRecord),
+		new(StackCompanyStatistic),
+		new(company_contract.CompanyContract),
+		new(company_contract.CompanyContractPermission),
+		new(company_approval.CompanyApproval),
+		new(Classify),
+		new(ReportSendThsDetail),
+		new(Report),
+		new(UserViewStatistics),
+		new(roadshow.RsReportRecord), //路演记录
+		new(CompanyReportRecord),
+	)
+
+	// 注册客户信息 数据表
+	initCompany()
+
+	// 注册Edb指标 数据表
+	initEdbDataTable()
+
+	// 注册ETA表格 数据表
+	initYbTable()
+}
+
+// initCompany 注册客户信息 数据表
+func initCompany() {
+	//注册对象
+	orm.RegisterModel(
 		new(Company),
 		new(CompanyReportPermission),
 		new(CompanyReportPermissionLog),
+		new(CompanyOperationRecord),
+		new(CompanyProduct),
+		new(CompanyPermissionLog),
+		new(CompanyEndDate),
+		new(CompanyProductUpdateLog), //客户产品状态变更表
+		new(CompanyViewStatistics),
+	)
+}
+
+// initEdbDataTable 注册Edb指标 数据表
+func initEdbDataTable() {
+	//注册对象
+	orm.RegisterModel(
 		new(DataSourceLongzhong),
 		new(Longzhonginfo),
 		new(Longzhongdata),
 		new(EdbdataClassify),
 		new(Longzhongpriceinfo),
 		new(Longzhongpricedata),
-		new(CompanyOperationRecord),
-		new(CompanyProduct),
-		new(StackCompanyStatistic),
-		new(CompanyPermissionLog),
-		new(company_contract.CompanyContract),
-		new(company_contract.CompanyContractPermission),
-		new(company_approval.CompanyApproval),
+		new(LongzhongSurveyProduct),
+		new(LongzhongSurveyData),
 		new(data_manage.EdbDataWind),
 		new(data_manage.EdbDataThs),
 		new(data_manage.EdbDataPb),
-		new(LongzhongSurveyProduct),
-		new(LongzhongSurveyData),
-		new(Classify),
-		new(ReportSendThsDetail),
-		new(Report),
-		new(CompanyEndDate),
 		new(data_manage.BaseFromSmm),
 		new(data_manage.BaseFromSmmIndex),
 		new(data_manage.BaseFromSmmData),
 		new(data_manage.EdbDataYs),
 		new(Edbdata),
 		new(data_manage.EdbInfoCalculateMapping),
-		new(UserViewStatistics),
 		new(data_manage.EdbInfo),                 //hz_data库的edb_info表
 		new(data_manage.EdbDataCalculateZjpj),    //直接拼接
 		new(data_manage.EdbDataCalculateLjztbpj), //累计同比值拼接
-		new(yb.Activity),                         // 研报活动表
-		new(yb.ActivityType),                     //研报活动分类表
-		new(yb.ActivityVoice),                    //研报活动语音表
-		new(yb.ActivityRegister),                 //研报活动报名表
-		new(yb.Speaker),                          //研报主持人表
 		new(data_manage.EdbDataLt),               //路透指标数据表
-		new(CompanyProductUpdateLog),             //客户产品状态变更表
-		new(roadshow.RsReportRecord),             //路演记录
-		new(CompanyReportRecord),
-		new(CompanyViewStatistics),
+	)
+}
+
+// initYbTable 注册ETA表格 数据表
+func initYbTable() {
+	//注册对象
+	orm.RegisterModel(
+		new(yb.Activity),         // 研报活动表
+		new(yb.ActivityType),     //研报活动分类表
+		new(yb.ActivityVoice),    //研报活动语音表
+		new(yb.ActivityRegister), //研报活动报名表
+		new(yb.Speaker),          //研报主持人表
 	)
 }