修改海外客户状态

controllers/overseas_custom/custom.go

@@ -110,8 +110,8 @@ func (this *OverseasCustomController) CustomList() {
 		condition += ` AND m.overseas_status='试用'`
 	} else if companyStatus == "正式" {
 		condition += ` AND m.overseas_status='正式' `
-	} else {
-		condition += ` AND m.company_status='关闭' `
+	} else if companyStatus == "关闭" {
+		condition += ` AND m.overseas_status='关闭' `
 	}
 
 	total, err := obj.GetCustomListCount(condition, pars, companyStatus)
@@ -443,12 +443,12 @@ func (this *OverseasCustomController) CustomStatistics() {
 		return
 	}
 
-	total, err := obj.GetCustomOverseasStatusTotal(condition, pars)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取海外客户总计状态失败, Err: " + err.Error()
-		return
-	}
+	//total, err := obj.GetCustomOverseasStatusTotal(condition, pars)
+	//if err != nil && err.Error() != utils.ErrNoRow() {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "获取海外客户总计状态失败, Err: " + err.Error()
+	//	return
+	//}
 	statisticsDataStatusList := make([]*overseas_custom.CustomTotal, 0)
 	statisticsDataMap := make(map[string]int)
 	for _, v := range list {
@@ -463,12 +463,6 @@ func (this *OverseasCustomController) CustomStatistics() {
 		if val, ok := statisticsDataMap[v]; ok {
 			item.Total = val
 		}
-
-		if v == "正式" {
-			item.Total = item.Total + total
-		} else if v == "试用" {
-			item.Total = item.Total - total
-		}
 		statisticsDataStatusList = append(statisticsDataStatusList, item)
 	}
 

models/overseas_custom/custom.go

@@ -40,7 +40,7 @@ func (obj *Custom) GetCustomTotal(condition string, pars []interface{}) (list []
 		databaseName = "hongze_rddp"
 	}
 
-	sql = `SELECT company_status,COUNT(1) AS total,is_hide FROM (
+	sql = `SELECT overseas_status AS company_status,COUNT(1) AS total,is_hide FROM (
 				SELECT a.company_id,a.company_name,a.nation,b.seller_id,b.seller_name,
 				b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time,a.is_hide,a.overseas_status,b.overseas_label
 				FROM company AS a
@@ -69,45 +69,46 @@ func (obj *Custom) GetCustomTotal(condition string, pars []interface{}) (list []
 	return
 }
 
-func (obj *Custom) GetCustomOverseasStatusTotal(condition string, pars []interface{}) (total int, err error) {
-	o := orm.NewOrm()
-	sql := ``
-	var databaseName string
-	if utils.RunMode == "debug" {
-		databaseName = "test_v2_hongze_rddp"
-	} else {
-		databaseName = "hongze_rddp"
-	}
-
-	sql = `SELECT COUNT(1) AS total FROM (
-				SELECT a.company_id,a.company_name,a.nation,b.seller_id,b.seller_name,
-				b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time,a.is_hide,a.overseas_status,b.overseas_label
-				FROM company AS a
-				INNER JOIN company_product AS b ON a.company_id=b.company_id
-				INNER JOIN overseas_custom_seller AS c ON b.seller_id=c.seller_id
-				WHERE b.is_overseas = 0
-				UNION ALL
-				SELECT t.company_id+10000000,t.company_name,t.nation,t.seller_id,t.seller_name,
-				t.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,t.overseas_label
-				FROM %s.english_company AS t
-				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
-				WHERE 1=1 AND t.is_deleted=0
-				)AS m
-		WHERE 1=1
- AND m.is_hide=0  
-AND m. overseas_status='正式' `
-
-	if condition != "" {
-		sql += condition
-	}
-
-	sql += ` GROUP BY m.overseas_status `
-
-	sql = fmt.Sprintf(sql, databaseName)
-
-	err = o.Raw(sql, pars).QueryRow(&total)
-	return
-}
+//
+//func (obj *Custom) GetCustomOverseasStatusTotal(condition string, pars []interface{}) (total int, err error) {
+//	o := orm.NewOrm()
+//	sql := ``
+//	var databaseName string
+//	if utils.RunMode == "debug" {
+//		databaseName = "test_v2_hongze_rddp"
+//	} else {
+//		databaseName = "hongze_rddp"
+//	}
+//
+//	sql = `SELECT COUNT(1) AS total FROM (
+//				SELECT a.company_id,a.company_name,a.nation,b.seller_id,b.seller_name,
+//				b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time,a.is_hide,a.overseas_status,b.overseas_label
+//				FROM company AS a
+//				INNER JOIN company_product AS b ON a.company_id=b.company_id
+//				INNER JOIN overseas_custom_seller AS c ON b.seller_id=c.seller_id
+//				WHERE b.is_overseas = 0
+//				UNION ALL
+//				SELECT t.company_id+10000000,t.company_name,t.nation,t.seller_id,t.seller_name,
+//				t.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.is_hide,t.overseas_status,t.overseas_label
+//				FROM %s.english_company AS t
+//				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
+//				WHERE 1=1 AND t.is_deleted=0
+//				)AS m
+//		WHERE 1=1
+// AND m.is_hide=0
+//AND m. overseas_status='正式' `
+//
+//	if condition != "" {
+//		sql += condition
+//	}
+//
+//	sql += ` GROUP BY m.overseas_status `
+//
+//	sql = fmt.Sprintf(sql, databaseName)
+//
+//	err = o.Raw(sql, pars).QueryRow(&total)
+//	return
+//}
 
 // GetCompanyIdsByKeyword 关键词获取客户IDs
 func (obj *Custom) GetCompanyIdsByKeyword(keyword string) (companyIds []int, err error) {