diff --git a/business/model/api_config.go b/business/model/api_config.go index 6b4561217..5ef647a6b 100644 --- a/business/model/api_config.go +++ b/business/model/api_config.go @@ -181,8 +181,8 @@ func GetVendorType(vendorID int) (vendorType int) { type AppKeyConfig struct { ModelIDCULD - VendorID int `json:"vendorID"` - OrgCode string `orm:"size(32)" json:"orgCode"` // 同一平台下不同的商户代码,如果只有一个,可以为空 + VendorID int `json:"vendorID"` + VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码,如果只有一个,可以为空 Name string `orm:"size(32)" json:"name"` Value1 string `orm:"size(1024)" json:"value1"` @@ -194,6 +194,6 @@ type AppKeyConfig struct { func (a *AppKeyConfig) TableUnique() [][]string { return [][]string{ - []string{"VendorID", "OrgCode", "DeletedAt"}, + []string{"VendorID", "VendorOrgCode", "DeletedAt"}, } } diff --git a/business/model/sku.go b/business/model/sku.go index 12f52a783..e5ead117d 100644 --- a/business/model/sku.go +++ b/business/model/sku.go @@ -162,6 +162,23 @@ func (*SkuCategory) TableIndex() [][]string { } } +type SkuCategoryMap struct { + ModelIDCULD + + CatID int `orm:"column(cat_id)" json:"catID"` + VendorID int `orm:"column(vendor_id)" json:"vendorID"` + VendorOrgCode string `orm:"size(32)" json:"vendorOrgCode"` // 同一平台下不同的商户代码,如果只有一个,可以为空 + + VendorCatID string `orm:"size(32);column(vendor_cat_id)" json:"vendorCatID"` +} + +func (*SkuCategoryMap) TableUnique() [][]string { + return [][]string{ + []string{"CatID", "VendorID", "VendorOrgCode", "DeletedAt"}, + []string{"VendorCatID", "VendorID", "VendorOrgCode", "DeletedAt"}, + } +} + type SkuName struct { ModelIDCULD