修改海外客户列表

controllers/overseas_custom/custom.go

@@ -143,8 +143,19 @@ func (this *OverseasCustomController) CustomList() {
 	}
 
 	for _, v := range list {
-		if v.Source == 1 && v.OverseasStatus != "" {
-			v.CompanyStatus = v.OverseasStatus
+		//if v.Source == 1 && v.OverseasStatus != "" {
+		//	v.CompanyStatus = v.OverseasStatus
+		//}
+		if v.Source == 1 {
+			v.CompanyStatus = v.Status
+		} else {
+			if v.Status == "正式" || v.Status == "永续" {
+				v.CompanyStatus = "正式"
+			} else if v.Status == "试用" {
+				v.CompanyStatus = "试用"
+			} else {
+				v.CompanyStatus = "关闭"
+			}
 		}
 	}
 	page = paging.GetPaging(currentIndex, pageSize, total)
@@ -290,7 +301,8 @@ func (this *OverseasCustomController) CustomStatusSet() {
 	var resetBtn int
 
 	if item.OverseasStatus == "正式" && item.ResetBtn == 2 { //重置，获取当前客户的状态
-		overseasStatus = item.CompanyStatus
+		//overseasStatus = item.CompanyStatus
+		overseasStatus = ""
 		resetBtn = 1
 	} else if item.OverseasStatus == "试用" && (item.ResetBtn == 1 || item.ResetBtn == 0) { //转正式，获取当前客户的状态
 		overseasStatus = "正式"
@@ -304,7 +316,7 @@ func (this *OverseasCustomController) CustomStatusSet() {
 		enCompanyObj.CompanyId = req.CompanyId - utils.EnCompanyIdStep
 		enCompanyObj.OverseasStatus = overseasStatus
 		enCompanyObj.ModifyTime = nowTime
-		enCompanyObj.ResetBtn = resetBtn
+		enCompanyObj.ResetBtn = resetBtn //转正式和重置按钮:同步过来默认为0:显示转正式为1:显示重置为2
 		updateCols := []string{"OverseasStatus", "ResetBtn", "ModifyTime"}
 		if err = enCompanyObj.Update(updateCols); err != nil {
 			br.Msg = "设置失败"

controllers/overseas_custom/sale.go

@@ -78,12 +78,12 @@ func (this *OverseasCustomController) SaleSave() {
 					return
 				}
 				//修改客户状态
-				err = obj.HandelCompanyStatus(v)
-				if err != nil {
-					br.Msg = "保存失败！"
-					br.ErrMsg = "保存失败,同步客户状态失败,Err:" + err.Error()
-					return
-				}
+				//err = obj.HandelCompanyStatus(v)
+				//if err != nil {
+				//	br.Msg = "保存失败！"
+				//	br.ErrMsg = "保存失败,同步客户状态失败,Err:" + err.Error()
+				//	return
+				//}
 			}
 		}
 	}

models/overseas_custom/custom.go

@@ -23,6 +23,7 @@ type Custom struct {
 	Source         int    `description:"来源:1，英文客户,2:客户列表"`
 	OverseasLabel  int    `description:"海外客户试用子标签：1未分类、2  推进、3 跟踪、4 预备、"`
 	ResetBtn       int    `description:"转正式和重置按钮:同步过来默认为0:显示转正式为1:显示重置为2"`
+	Status         string `description:"客户状态"`
 }
 
 type CustomTotal struct {
@@ -168,7 +169,7 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, sortField
 	sql = `SELECT * 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,
-				2 AS source,b.overseas_label,a.reset_btn
+				2 AS source,b.overseas_label,a.reset_btn,b.status
 				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
@@ -177,7 +178,7 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, sortField
 				UNION ALL
 				SELECT t.company_id+10000000,t.company_name,t.nation,t.seller_id,t.seller_name,
 				t.view_total,t.road_show_total,t.create_time,t.last_view_time,t.is_hide,t.overseas_status,
-				1 AS source,t.overseas_label,t.reset_btn
+				1 AS source,t.overseas_label,t.reset_btn,CASE t.enabled WHEN 0 THEN '关闭' WHEN 1 THEN '试用' WHEN 2 THEN '试用' END status
 				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 `