新增客户所属国家

controllers/company.go

@@ -2845,6 +2845,7 @@ func (this *CompanyController) Add() {
 	item.Enabled = 1
 	item.RegionType = req.RegionType
 	item.Remark = req.Reasons
+	item.Nation = req.Nation
 	companyId, err := company.AddCompany(item)
 	if err != nil {
 		br.Msg = "新增失败"
@@ -4093,6 +4094,7 @@ func (this *CompanyController) Edit() {
 	companyItem.Address = req.Province + req.City
 	companyItem.LastUpdatedTime = time.Now()
 	companyItem.Enabled = 1
+	companyItem.Nation = req.Nation
 	err = company.ModifyCompany(companyItem)
 	if err != nil {
 		br.Msg = "修改客户信息失败"

controllers/english_report/english_company.go

@@ -293,6 +293,7 @@ func (this *EnglishCompanyController) Save() {
 		item.ModifyTime = nowTime
 		item.Status = 1
 		item.Enabled = 1
+		item.Nation = req.Nation
 		if e = item.Create(); e != nil {
 			br.Msg = "保存失败"
 			br.ErrMsg = "新增英文客户失败, Err:" + e.Error()

models/banner_view_history.go

@@ -21,7 +21,7 @@ type BannerViewHistory struct {
 }
 
 func GetBannerHistoryList() (items []*BannerHistoryListRespItem, err error) {
-	sql := ` SELECT *,COUNT(*) AS pv,MAX(last_updated_time) AS latest_update_time  FROM banner_view_history 
+	sql := ` SELECT *,COUNT(*) AS pv,MAX(last_updated_time) AS last_updated_time  FROM banner_view_history 
 WHERE 1=1 GROUP BY   
 banner_url,
   first_source,

models/company/company.go

@@ -41,6 +41,7 @@ type Company struct {
 	Remark          string    `description:"备注信息"`
 	RegionType      string    `description:"地区类型，国内，国外"`
 	OpenCompanyCode string    `description:"开放给第三方的客户编码，不让第三方定位我们的客户信息"`
+	Nation          string    `description:"所属国家"`
 }
 
 // 新增客户
@@ -94,6 +95,7 @@ type CompanySearchItem struct {
 	IsSigning           int    `description:"是否签约过，1是，0否"`
 	SigningStatus       string `description:"签约状态，已签约过/未签约过"`
 	CompanyStatusButton *CompanyStatusButton
+	Nation              string `description:"所属国家"`
 }
 
 type CompanySearchListResp struct {
@@ -213,6 +215,7 @@ type CompanyItem struct {
 	IsSigning           int                  `description:"是否签约过，1是，0否"`
 	SigningStatus       string               `description:"签约状态，已签约过/未签约过"`
 	CompanyStatusButton *CompanyStatusButton
+	Nation              string `description:"所属国家"`
 }
 
 type CompanyListItem struct {
@@ -389,7 +392,8 @@ as sort_todo_end_time,
 			MIN(b.end_date) as min_end_date,
 			SUM(b.view_total) as all_view_total,
 			SUM(b.try_out_day_total) as all_try_out_day_total,
-			IF(LEFT(GROUP_CONCAT(DISTINCT b.last_view_time ORDER BY b.product_id), 19) >= "` + t + `", 1, 0) AS week_view_active
+			IF(LEFT(GROUP_CONCAT(DISTINCT b.last_view_time ORDER BY b.product_id), 19) >= "` + t + `", 1, 0) AS week_view_active,
+			a.nation
 			FROM company AS a
 			INNER JOIN company_product AS b ON a.company_id=b.company_id
 			WHERE a.enabled=1  `
@@ -567,6 +571,7 @@ type CompanyAddReq struct {
 	RegionType    string `description:"地区类型，国内，海外"`
 	UserId        int    `description:"联系人ID"`
 	Scale         string `description:"管理规模，空不填，1：:50亿以下，2：50~100亿，3：100亿以上。"`
+	Nation        string `description:"所属国家"`
 }
 
 // 新增客户请求参数
@@ -601,6 +606,7 @@ type CompanyDetail struct {
 	ShareSeller     string `description:"共享销售员"`
 	ShareSellerId   int    `description:"共享销售员id"`
 	IsScrounge      int    `description:"是否白嫖 0不是 1是"`
+	Nation          string `description:"所属国家"`
 }
 
 type CompanyDetailResp struct {
@@ -705,6 +711,7 @@ type CompanyEditReq struct {
 	CreditCode  string                   `description:"社会统一信用码"`
 	Province    string                   `description:"省"`
 	City        string                   `description:"市"`
+	Nation      string                   `description:"所属国家"`
 	Products    []*CompanyProductEditReq `description:"产品信息"`
 }
 
@@ -761,9 +768,10 @@ func ModifyCompany(item *Company) (err error) {
 			  address = ?,
 			  last_updated_time = NOW(),
 			  province = ?,
-			  city = ?
+			  city = ?,
+			  nation=?
 			WHERE company_id =?`
-	_, err = o.Raw(sql, item.CompanyName, item.CreditCode, item.Address, item.Province, item.City, item.CompanyId).Exec()
+	_, err = o.Raw(sql, item.CompanyName, item.CreditCode, item.Address, item.Province, item.City, item.Nation, item.CompanyId).Exec()
 	return
 }
 

models/english_company.go

@@ -26,6 +26,7 @@ type EnglishCompany struct {
 	ModifyTime  time.Time `description:"更新时间"`
 	Enabled     int       `description:"0-禁用; 1-启用; 2-部分禁用"`
 	Status      int       `description:"1:正式,2:临时,3:终止"`
+	Nation      string    `description:"所属国家"`
 }
 
 type EnglishCompanyListItem struct {
@@ -56,6 +57,7 @@ type EnglishCompanySaveReq struct {
 	CountryCode   string `description:"国家代码"`
 	Country       string `description:"国家"`
 	SellerId      int    `description:"销售ID"`
+	Nation        string `description:"所属国家"`
 	EnPermissions []int  `description:"英文权限IDs"`
 }