Merge branch 'aj_overseas_custorm' into debug

controllers/company.go

@@ -8778,8 +8778,19 @@ func (this *CompanyController) RoadShowList() {
 	}
 
 	companyId := this.GetString("CompanyId")
+
+	companyIdInt, _ := strconv.Atoi(companyId)
+	if companyIdInt <= 0 {
+		br.Msg = "参数错误"
+		return
+	}
+	var englishCompany int
+	if companyIdInt > utils.EnCompanyIdStep {
+		companyIdInt = companyIdInt - utils.EnCompanyIdStep
+		englishCompany = 1
+	}
 	var err error
-	roadShowList, err := company.GetRoadShowList(companyId)
+	roadShowList, err := company.GetRoadShowList(companyIdInt, englishCompany)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

models/company/company.go

@@ -1651,7 +1651,7 @@ type RoadShowCalendar struct {
 	EndDate          time.Time
 }
 
-func GetRoadShowList(companyId string) (items []*RoadShowCalendar, err error) {
+func GetRoadShowList(companyId, englishCompany int) (items []*RoadShowCalendar, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
 	a.*,b.end_date
@@ -1662,9 +1662,10 @@ WHERE
 	a.source = 0 
 	AND a.company_id=?
 	AND b.status = 2 
+    AND a.english_company=?
 	AND NOW()> DATE_FORMAT( CONCAT( end_date, " ", end_time ), '%Y-%m-%d %H:%i:%S' ) 
 	GROUP BY rs_calendar_id  ORDER BY create_time DESC `
-	_, err = o.Raw(sql, companyId).QueryRows(&items)
+	_, err = o.Raw(sql, companyId, englishCompany).QueryRows(&items)
 	return
 }
 

models/overseas_custom/custom.go

@@ -177,7 +177,7 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, companySt
 				CASE t.enabled
 				WHEN 0 THEN '关闭'
 				ELSE '试用' END AS company_status,
-				t.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,
+				t.view_total,t.road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,
 				1 AS source,t.overseas_label
 				FROM %s.english_company AS t
 				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id