去掉海外客户限制

controllers/overseas_custom/custom.go

@@ -135,7 +135,7 @@ func (this *OverseasCustomController) CustomList() {
 		return
 	}
 
-	list, err := obj.GetCustomList(condition, pars, companyStatus, sortField, startSize, pageSize, sortDesc)
+	list, err := obj.GetCustomList(condition, pars, sortField, startSize, pageSize, sortDesc)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败, Err: " + err.Error()

models/overseas_custom/custom.go

@@ -120,7 +120,7 @@ WHERE 1=1 AND (a.email LIKE ? OR a.mobile LIKE ? OR b.company_name LIKE ? OR b.c
 	return
 }
 
-func (obj *Custom) GetCustomListCount(condition string, pars []interface{}, companyStatus string) (count int, err error) {
+func (obj *Custom) GetCustomListCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrm()
 	sql := ``
 	var databaseName string
@@ -137,13 +137,6 @@ func (obj *Custom) GetCustomListCount(condition string, pars []interface{}, comp
 				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`
-	if companyStatus == "正式" {
-		sql += ` AND b.status IN('正式','永续') `
-	} else if companyStatus == "试用" {
-		sql += ` AND b.status='试用' `
-	} else if companyStatus == "关闭" {
-		sql += ` AND b.status IN('冻结','流失','关闭') `
-	}
 	sql += `
 				UNION ALL
 				SELECT t.company_id+10000000,t.company_name,t.nation,t.seller_id,t.seller_name,
@@ -151,12 +144,6 @@ func (obj *Custom) GetCustomListCount(condition string, pars []interface{}, comp
 				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 `
-	if companyStatus == "试用" {
-		sql += ` AND t.enabled IN(1,2)`
-	} else if companyStatus == "禁用" {
-		sql += ` AND t.enabled = 0 `
-	}
-
 	sql += `		)AS m
 		WHERE 1=1 `
 
@@ -168,7 +155,7 @@ func (obj *Custom) GetCustomListCount(condition string, pars []interface{}, comp
 	return
 }
 
-func (obj *Custom) GetCustomList(condition string, pars []interface{}, companyStatus, sortField string, startSize, pageSize, sortDesc int) (list []*Custom, err error) {
+func (obj *Custom) GetCustomList(condition string, pars []interface{}, sortField string, startSize, pageSize, sortDesc int) (list []*Custom, err error) {
 	o := orm.NewOrm()
 	sql := ``
 	var databaseName string
@@ -186,13 +173,6 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, companySt
 				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.product_id=1 AND b.is_overseas = 0`
-	if companyStatus == "正式" {
-		sql += ` AND b.status IN('正式','永续') `
-	} else if companyStatus == "试用" {
-		sql += ` AND b.status='试用' `
-	} else if companyStatus == "关闭" {
-		sql += ` AND b.status IN('冻结','流失','关闭') `
-	}
 	sql += `
 				UNION ALL
 				SELECT t.company_id+10000000,t.company_name,t.nation,t.seller_id,t.seller_name,
@@ -201,11 +181,6 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, companySt
 				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 `
-	if companyStatus == "试用" {
-		sql += ` AND t.enabled IN(1,2)`
-	} else if companyStatus == "禁用" {
-		sql += ` AND t.enabled = 0 `
-	}
 
 	sql += `		)AS m WHERE 1=1 `
 
@@ -232,7 +207,7 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, companySt
 		sortDescStr = "ASC"
 	}
 
-	sql += ` ORDER BY %s %s,m.create_time `
+	sql += ` ORDER BY %s %s,m.create_time DESC`
 	sql += ` LIMIT ?,? `
 	sql = fmt.Sprintf(sql, databaseName, sortFieldStr, sortDescStr)
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)