|
@@ -46,7 +46,7 @@ func (obj *Custom) GetCustomTotal(condition string, pars []interface{}) (list []
|
|
|
WHEN '永续' THEN '正式'
|
|
|
WHEN '试用' THEN '试用'
|
|
|
ELSE '关闭' END AS company_status,
|
|
|
- b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time
|
|
|
+ b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time,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
|
|
@@ -56,7 +56,7 @@ func (obj *Custom) GetCustomTotal(condition string, pars []interface{}) (list []
|
|
|
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.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,t.overseas_label
|
|
|
FROM %s.english_company AS t
|
|
|
INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
|
|
|
)AS m
|
|
@@ -102,7 +102,7 @@ func (obj *Custom) GetCustomListCount(condition string, pars []interface{}, comp
|
|
|
WHEN '永续' THEN '正式'
|
|
|
WHEN '试用' THEN '试用'
|
|
|
ELSE '关闭' END AS company_status,
|
|
|
- b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time
|
|
|
+ b.view_total,b.road_show_total,a.created_time AS create_time,b.last_view_time,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
|
|
@@ -120,7 +120,7 @@ func (obj *Custom) GetCustomListCount(condition string, pars []interface{}, comp
|
|
|
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.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,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 `
|
|
@@ -225,7 +225,6 @@ type CustomListResp struct {
|
|
|
OverseasLabelData []*OverseasLabelTotal
|
|
|
}
|
|
|
|
|
|
-// EnglishCompanySaveReq 英文客户-保存请求体
|
|
|
type CustomHideReq struct {
|
|
|
CompanyId int `description:"客户ID"`
|
|
|
}
|
|
@@ -240,6 +239,10 @@ func (obj *Custom) GetCustomByCompanyId(companyId int) (list *Custom, err error)
|
|
|
databaseName = "hongze_rddp"
|
|
|
}
|
|
|
|
|
|
+ if companyId > utils.EnCompanyIdStep {
|
|
|
+ companyId = companyId - utils.EnCompanyIdStep
|
|
|
+ }
|
|
|
+
|
|
|
sql = `SELECT * FROM (
|
|
|
SELECT a.company_id,a.company_name,a.nation,b.seller_id,b.seller_name,
|
|
|
CASE b.status
|
|
@@ -320,3 +323,8 @@ func (obj *Custom) GetCustomOverseasLabelTotal(condition string, pars []interfac
|
|
|
_, err = o.Raw(sql, pars).QueryRows(&list)
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+type CustomOverseasLabelSetReq struct {
|
|
|
+ CompanyId int `description:"客户ID"`
|
|
|
+ OverseasLabel int `description:"海外客户试用子标签:1未分类、2 推进、3 跟踪、4 预备、"`
|
|
|
+}
|