Merge branch 'crm_16.6_ficc' into debug

models/db.go

@@ -32,47 +32,60 @@ func init() {
 	report_db, _ := orm.GetDB("rddp")
 	report_db.SetConnMaxLifetime(10 * time.Minute)
 
-	_ = orm.RegisterDataBase("edb", "mysql", utils.MYSQL_URL_EDB)
-	orm.SetMaxIdleConns("edb", 50)
-	orm.SetMaxOpenConns("edb", 100)
-
-	edb_db, _ := orm.GetDB("edb")
-	edb_db.SetConnMaxLifetime(10 * time.Minute)
-
-	_ = orm.RegisterDataBase("data", "mysql", utils.MYSQL_URL_DATA)
-	orm.SetMaxIdleConns("data", 50)
-	orm.SetMaxOpenConns("data", 100)
-
-	data_db, _ := orm.GetDB("data")
-	data_db.SetConnMaxLifetime(10 * time.Minute)
-
-	_ = orm.RegisterDataBase("gl", "mysql", utils.MYSQL_URL_GL)
-	orm.SetMaxIdleConns("gl", 50)
-	orm.SetMaxOpenConns("gl", 100)
-
-	gl, _ := orm.GetDB("gl")
-	gl.SetConnMaxLifetime(10 * time.Minute)
-
-	_ = orm.RegisterDataBase("weekly_trial", "mysql", utils.MYSQL_URL_WEEKLY_TRIAL)
-	orm.SetMaxIdleConns("weekly_trial", 50)
-	orm.SetMaxOpenConns("weekly_trial", 100)
-
-	trial_datadb, _ := orm.GetDB("weekly_trial")
-	trial_datadb.SetConnMaxLifetime(10 * time.Minute)
-
-	_ = orm.RegisterDataBase("eta", "mysql", utils.MYSQL_URL_ETA)
-	orm.SetMaxIdleConns("eta", 50)
-	orm.SetMaxOpenConns("eta", 100)
-
-	etaDb, _ := orm.GetDB("eta")
-	etaDb.SetConnMaxLifetime(10 * time.Minute)
-
-	_ = orm.RegisterDataBase("hz_cygx", "mysql", utils.MYSQL_URL_CYGX)
-	orm.SetMaxIdleConns("hz_cygx", 50)
-	orm.SetMaxOpenConns("hz_cygx", 100)
-
-	cygx_db, _ := orm.GetDB("hz_cygx")
-	cygx_db.SetConnMaxLifetime(10 * time.Minute)
+	if utils.MYSQL_URL_EDB != "" {
+		_ = orm.RegisterDataBase("edb", "mysql", utils.MYSQL_URL_EDB)
+		orm.SetMaxIdleConns("edb", 50)
+		orm.SetMaxOpenConns("edb", 100)
+
+		edb_db, _ := orm.GetDB("edb")
+		edb_db.SetConnMaxLifetime(10 * time.Minute)
+
+	}
+
+	if utils.MYSQL_URL_DATA != "" {
+		_ = orm.RegisterDataBase("data", "mysql", utils.MYSQL_URL_DATA)
+		orm.SetMaxIdleConns("data", 50)
+		orm.SetMaxOpenConns("data", 100)
+
+		data_db, _ := orm.GetDB("data")
+		data_db.SetConnMaxLifetime(10 * time.Minute)
+	}
+
+	if utils.MYSQL_URL_GL != "" {
+		_ = orm.RegisterDataBase("gl", "mysql", utils.MYSQL_URL_GL)
+		orm.SetMaxIdleConns("gl", 50)
+		orm.SetMaxOpenConns("gl", 100)
+
+		gl, _ := orm.GetDB("gl")
+		gl.SetConnMaxLifetime(10 * time.Minute)
+	}
+
+	if utils.MYSQL_URL_WEEKLY_TRIAL != "" {
+		_ = orm.RegisterDataBase("weekly_trial", "mysql", utils.MYSQL_URL_WEEKLY_TRIAL)
+		orm.SetMaxIdleConns("weekly_trial", 50)
+		orm.SetMaxOpenConns("weekly_trial", 100)
+
+		trial_datadb, _ := orm.GetDB("weekly_trial")
+		trial_datadb.SetConnMaxLifetime(10 * time.Minute)
+	}
+
+	if utils.MYSQL_URL_ETA != "" {
+		_ = orm.RegisterDataBase("eta", "mysql", utils.MYSQL_URL_ETA)
+		orm.SetMaxIdleConns("eta", 50)
+		orm.SetMaxOpenConns("eta", 100)
+
+		etaDb, _ := orm.GetDB("eta")
+		etaDb.SetConnMaxLifetime(10 * time.Minute)
+	}
+
+	if utils.MYSQL_URL_CYGX != "" {
+		_ = orm.RegisterDataBase("hz_cygx", "mysql", utils.MYSQL_URL_CYGX)
+		orm.SetMaxIdleConns("hz_cygx", 50)
+		orm.SetMaxOpenConns("hz_cygx", 100)
+
+		cygx_db, _ := orm.GetDB("hz_cygx")
+		cygx_db.SetConnMaxLifetime(10 * time.Minute)
+	}
 
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)

models/roadshow/calendar.go

@@ -133,7 +133,7 @@ group by a.researcher_id,b.open_id
 `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, endTime).QueryRows(&list)
-	return nil, err
+	return
 }
 
 func ModifyRsCalendarResearcherQuestionMsgStatus(rsCalendarResearcher_id int) (err error) {

models/roadshow/report.go

@@ -81,6 +81,8 @@ type RsCalendarResearcherView struct {
 	IsSynced               int       `description:"是否与上海同步 0:未同步 1:已同步"`
 	ResearcherSort         int       `description:"研究员新增排序"`
 	QuestionStatus         int       `description:"问答状态：0-未填写；1-已填写"`
+	EnglishCompany         int       `description:"是否为英文客户: 0-否; 1-是"`
+	CompanyStatus          string    `description:"客户状态:'试用','永续','冻结','流失','正式','潜在'"`
 }
 
 func GetRsCalendarDetail(endDate string) (list []*RsCalendarResearcherView, err error) {

services/roadshow/report.go

@@ -172,15 +172,21 @@ func AddReportRecord(cont context.Context) (err error) {
 		}
 		company := new(roadshow.CompanySearchView)
 		if v.CompanyId > 0 {
-			if mapRaiSllerId[v.SysUserId] {
-				company, _ = companyMapRai[v.CompanyId] // 如果是权益销售添加的信息，就用权益相关的客户信息
-				if len(mapPermissionNameRai[v.CompanyId]) > 0 {
-					company.PermissionName = strings.Join(mapPermissionNameRai[v.CompanyId], "/")
-				}
+			if v.EnglishCompany == 1 { //如果是海外客户公司信息就直接拿存在海外的客户数据
+				company.CompanyId = v.CompanyId
+				company.CompanyName = v.CompanyName
+				company.Status = v.CompanyStatus
 			} else {
-				company, _ = companyMap[v.CompanyId]
-				if len(mapPermissionNameFicc[v.CompanyId]) > 0 {
-					company.PermissionName = strings.Join(mapPermissionNameFicc[v.CompanyId], "/")
+				if mapRaiSllerId[v.SysUserId] {
+					company, _ = companyMapRai[v.CompanyId] // 如果是权益销售添加的信息，就用权益相关的客户信息
+					if len(mapPermissionNameRai[v.CompanyId]) > 0 {
+						company.PermissionName = strings.Join(mapPermissionNameRai[v.CompanyId], "/")
+					}
+				} else {
+					company, _ = companyMap[v.CompanyId]
+					if len(mapPermissionNameFicc[v.CompanyId]) > 0 {
+						company.PermissionName = strings.Join(mapPermissionNameFicc[v.CompanyId], "/")
+					}
 				}
 			}
 		}