diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go index 1fe7225cb..00e8dfe9a 100644 --- a/business/jxstore/cms/sku.go +++ b/business/jxstore/cms/sku.go @@ -2666,7 +2666,7 @@ func deleteJdsSku(db *dao.DaoDB, skuID int) (err error) { return err } -func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark string, vendorID int, exPrefix, fromTime, toTime string, isAsync, isContinueWhenError bool) (hint string, err error) { +func UpdateSkuExinfoMap(ctx *jxcontext.Context, nameIDs []int, imgWaterMark string, brandID, vendorID int, vendorOrgCode, exPrefix, fromTime, toTime string, isAsync, isContinueWhenError bool) (hint string, err error) { var ( fromTimeP time.Time toTimeP time.Time diff --git a/business/model/store.go b/business/model/store.go index d032746a8..5c418b5bc 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -766,8 +766,11 @@ func (*StoreAudit) TableIndex() [][]string { type Brand struct { ModelIDCULD - Name string `orm:"size(255)" json:"name"` //品牌名 - Logo string `orm:"size(255)" json:"logo"` //品牌logo + Name string `orm:"size(255)" json:"name"` //品牌名 + Logo string `orm:"size(255)" json:"logo"` //品牌logo + BrandType int `json:"brandType"` //品牌类型 + IsOpen int `json:"isOpen"` //主要三方配送用,是否配送,默认0表示打开,1表示关 + EbaiSupplierID int `orm:"column(ebai_supplier_id)" json:"ebaiSupplierID"` //饿百供应商ID } func (*Brand) TableUnique() [][]string { diff --git a/business/model/vendor_org_code.go b/business/model/vendor_org_code.go index 7b2cd77de..89459d214 100644 --- a/business/model/vendor_org_code.go +++ b/business/model/vendor_org_code.go @@ -13,7 +13,8 @@ type VendorOrgCode struct { Comment string `json:"name"` //备注 //appkey,secret token等 - VendorType string `json:"vendorType"` //platform 普通平台, delivery 三方配送平台 - IsJxCat int `json:"isJxCat"` //是否使用京西分类,0默认使用 - IsOpen int `json:"isOpen"` //主要三方配送用,是否配送,默认0表示打开,1表示关 + VendorType string `json:"vendorType"` //platform 普通平台, delivery 三方配送平台 + IsJxCat int `json:"isJxCat"` //是否使用京西分类,0默认使用 + IsOpen int `json:"isOpen"` //主要三方配送用,是否配送,默认0表示打开,1表示关 + EmpowerURL string `orm:"column(empower_url)" json:"empowerURL"` //授权地址 } diff --git a/controllers/cms_sku.go b/controllers/cms_sku.go index 6d0704dba..0822eeb7a 100644 --- a/controllers/cms_sku.go +++ b/controllers/cms_sku.go @@ -541,7 +541,9 @@ func (c *SkuController) RefreshJdDepot() { // @Param fromDate formData string true "生效开始时间,格式 2006-01-01 " // @Param toDate formData string true "生效结束时间,格式 2006-01-01 " // @Param imgWaterMark formData string false "商品水印图" +// @Param brandID formData int false "品牌ID" // @Param vendorID formData int true "平台ID" +// @Param vendorOrgCode formData string true "平台账号" // @Param isAsync formData bool false "是否异步" // @Param isContinueWhenError formData bool false "单个同步失败是否继续,缺省false" // @Success 200 {object} controllers.CallResult @@ -551,7 +553,7 @@ func (c *SkuController) UpdateSkuExinfoMap() { c.callUpdateSkuExinfoMap(func(params *tSkuUpdateSkuExinfoMapParams) (retVal interface{}, errCode string, err error) { var skuIDList []int if err = jxutils.Strings2Objs(params.NameIDs, &skuIDList); err == nil { - retVal, err = cms.UpdateSkuExinfoMap(params.Ctx, skuIDList, params.ImgWaterMark, params.VendorID, params.ExPrefix, params.FromDate, params.ToDate, params.IsAsync, params.IsContinueWhenError) + retVal, err = cms.UpdateSkuExinfoMap(params.Ctx, skuIDList, params.ImgWaterMark, params.BrandID, params.VendorID, params.VendorOrgCode, params.ExPrefix, params.FromDate, params.ToDate, params.IsAsync, params.IsContinueWhenError) } return retVal, "", err })