Merge branch 'aj_overseas_custorm' into debug

controllers/overseas_custom/custom.go

@@ -1,11 +1,14 @@
 package overseas_custom
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/models"
+	"hongze/hz_crm_api/models/company"
 	"hongze/hz_crm_api/models/overseas_custom"
 	"hongze/hz_crm_api/utils"
+	"time"
 )
 
 // @Title 海外客户统计数据
@@ -176,3 +179,80 @@ func (this *OverseasCustomController) CustomList() {
 	br.Msg = "获取成功"
 	br.Data = resp
 }
+
+// @Title 客户隐藏
+// @Description 客户隐藏
+// @Param	request  body  overseas_custom.CustomHideReq  true  "type json string"
+// @Success 200 string "操作成功"
+// @router /custom/hide [post]
+func (this *OverseasCustomController) CustomHide() {
+	br := new(models.BaseResponse).Init()
+	br.IsSendEmail = false
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var req overseas_custom.CustomHideReq
+	if err := json.Unmarshal(this.Ctx.Input.RequestBody, &req); err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	if req.CompanyId <= 0 {
+		br.Msg = "参数错误！"
+		return
+	}
+
+	obj := new(overseas_custom.Custom)
+	item, err := obj.GetCustomByCompanyId(req.CompanyId)
+	if err != nil {
+		br.Msg = "隐藏失败！"
+		br.ErrMsg = "隐藏失败，Err:" + err.Error()
+		return
+	}
+	//是否隐藏:0:不隐藏,1:隐藏
+	var isHide int
+	if item.IsHide == 1 {
+		isHide = 0
+	} else {
+		isHide = 1
+	}
+
+	if req.CompanyId > 1000000 {
+		enCompanyObj := new(models.EnglishCompany)
+		// 更新客户
+		nowTime := time.Now().Local()
+		enCompanyObj.CompanyId = req.CompanyId - utils.EnCompanyIdStep
+		enCompanyObj.IsHide = isHide
+		enCompanyObj.ModifyTime = nowTime
+		updateCols := []string{"IsHide", "ModifyTime"}
+		if err = enCompanyObj.Update(updateCols); err != nil {
+			br.Msg = "隐藏失败"
+			br.ErrMsg = "更新英文客户隐藏状态失败, Err:" + err.Error()
+			return
+		}
+	} else {
+		companyObj := new(company.Company)
+		companyObj.CompanyId = req.CompanyId
+		companyObj.IsHide = isHide
+		updateCols := []string{"IsHide"}
+		err = companyObj.Update(updateCols)
+		if err != nil {
+			br.Msg = "隐藏失败"
+			br.ErrMsg = "更新客户隐藏状态失败, Err:" + err.Error()
+			return
+		}
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "隐藏成功"
+}

models/company/company.go

@@ -42,6 +42,8 @@ type Company struct {
 	RegionType      string    `description:"地区类型，国内，国外"`
 	OpenCompanyCode string    `description:"开放给第三方的客户编码，不让第三方定位我们的客户信息"`
 	Nation          string    `description:"所属国家"`
+	IsHide          int       `description:"是否隐藏:0:不隐藏,1:隐藏"`
+	OverseasStatus  int       `description:"海外客户状态:'正式','试用','关闭'"`
 }
 
 // 新增客户

models/english_company.go

@@ -14,19 +14,21 @@ const (
 
 // EnglishCompany 英文客户
 type EnglishCompany struct {
-	CompanyId   int       `orm:"column(company_id);pk" description:"英文客户ID"`
-	CompanyName string    `description:"客户名称"`
-	CountryCode string    `description:"国家Code"`
-	Country     string    `description:"国家"`
-	SellerId    int       `description:"销售ID"`
-	SellerName  string    `description:"销售姓名"`
-	ViewTotal   int       `description:"累计点击量/阅读量"`
-	IsDeleted   int       `description:"删除状态：0-正常；1-已删除"`
-	CreateTime  time.Time `description:"创建时间"`
-	ModifyTime  time.Time `description:"更新时间"`
-	Enabled     int       `description:"0-禁用; 1-启用; 2-部分禁用"`
-	Status      int       `description:"1:正式,2:临时,3:终止"`
-	Nation      string    `description:"所属国家"`
+	CompanyId      int       `orm:"column(company_id);pk" description:"英文客户ID"`
+	CompanyName    string    `description:"客户名称"`
+	CountryCode    string    `description:"国家Code"`
+	Country        string    `description:"国家"`
+	SellerId       int       `description:"销售ID"`
+	SellerName     string    `description:"销售姓名"`
+	ViewTotal      int       `description:"累计点击量/阅读量"`
+	IsDeleted      int       `description:"删除状态：0-正常；1-已删除"`
+	CreateTime     time.Time `description:"创建时间"`
+	ModifyTime     time.Time `description:"更新时间"`
+	Enabled        int       `description:"0-禁用; 1-启用; 2-部分禁用"`
+	Status         int       `description:"1:正式,2:临时,3:终止"`
+	Nation         string    `description:"所属国家"`
+	IsHide         int       `description:"是否隐藏:0:不隐藏,1:隐藏"`
+	OverseasStatus int       `description:"海外客户状态:'正式','试用','关闭'"`
 }
 
 type EnglishCompanyListItem struct {

models/overseas_custom/custom.go

@@ -8,16 +8,18 @@ import (
 )
 
 type Custom struct {
-	CompanyId     int    `description:"客户id"`
-	CompanyName   string `description:"客户名称"`
-	Nation        string `description:"国家"`
-	SellerId      int    `description:"销售id"`
-	SellerName    string `description:"销售名称"`
-	CompanyStatus string `description:"状态"`
-	ViewTotal     int    `description:"累计点击量"`
-	RoadShowTotal int    `description:"路演数量"`
-	LastViewTime  string `description:"最近阅读时间"`
-	CreateTime    string `description:"创建时间"`
+	CompanyId      int    `description:"客户id"`
+	CompanyName    string `description:"客户名称"`
+	Nation         string `description:"国家"`
+	SellerId       int    `description:"销售id"`
+	SellerName     string `description:"销售名称"`
+	CompanyStatus  string `description:"状态"`
+	ViewTotal      int    `description:"累计点击量"`
+	RoadShowTotal  int    `description:"路演数量"`
+	LastViewTime   string `description:"最近阅读时间"`
+	CreateTime     string `description:"创建时间"`
+	IsHide         int    `description:"是否隐藏:0:不隐藏,1:隐藏"`
+	OverseasStatus int    `description:"海外客户状态:'正式','试用','关闭'"`
 }
 
 type CustomTotal struct {
@@ -154,7 +156,7 @@ func (obj *Custom) GetCustomList(condition string, pars []interface{}, companySt
 				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,a.is_hide,a.overseas_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
@@ -172,7 +174,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.view_total,0 AS road_show_total,t.create_time,'' AS last_view_time,a.is_hide,a.overseas_status
 				FROM %s.english_company AS t
 				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
              WHERE 1=1 `
@@ -217,3 +219,48 @@ type CustomListResp struct {
 	Paging *paging.PagingItem
 	List   []*Custom
 }
+
+// EnglishCompanySaveReq 英文客户-保存请求体
+type CustomHideReq struct {
+	CompanyId int `description:"客户ID"`
+}
+
+func (obj *Custom) GetCustomByCompanyId(companyId int) (list *Custom, err error) {
+	o := orm.NewOrm()
+	sql := ``
+	var databaseName string
+	if utils.RunMode == "debug" {
+		databaseName = "test_v2_hongze_rddp"
+	} else {
+		databaseName = "hongze_rddp"
+	}
+
+	sql = `SELECT * FROM (
+				SELECT a.company_id,a.company_name,a.nation,b.seller_id,b.seller_name,
+				CASE b.status 
+				WHEN '正式' THEN '正式'
+				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,a.is_hide,a.overseas_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
+				WHERE b.is_overseas = 0`
+	sql += ` UNION ALL
+				SELECT t.company_id+10000000,t.company_name,t.nation,t.seller_id,t.seller_name,
+				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,a.is_hide,a.overseas_status
+				FROM %s.english_company AS t
+				INNER JOIN overseas_custom_seller AS n ON t.seller_id=n.seller_id
+             WHERE 1=1 `
+
+	sql += `		)AS m WHERE 1=1 `
+
+	sql += ` AND m.company_id=? `
+	sql = fmt.Sprintf(sql, databaseName)
+	_, err = o.Raw(sql, companyId).QueryRows(&list)
+	return
+}

utils/constants.go

@@ -571,3 +571,7 @@ func GetWeeklyDatabase() (databaseName string) {
 	}
 	return
 }
+
+const (
+	EnCompanyIdStep = 10000000
+)