diff --git a/business/jxstore/common/common.go b/business/jxstore/common/common.go index 7ba9e7a0b..3704bb470 100644 --- a/business/jxstore/common/common.go +++ b/business/jxstore/common/common.go @@ -231,6 +231,6 @@ func GetStoreListByLocation(ctx *jxcontext.Context, lng, lat float64, maxRadius return storeList, err } -func GetVendorOrgCode(ctx *jxcontext.Context, vendorID int, vendorOrgCode string) (vendorOrgs []*model.VendorOrgCode, err error) { - return dao.GetVendorOrgCode(dao.GetDB(), vendorID, vendorOrgCode) +func GetVendorOrgCode(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorType string) (vendorOrgs []*model.VendorOrgCode, err error) { + return dao.GetVendorOrgCode(dao.GetDB(), vendorID, vendorOrgCode, vendorType) } diff --git a/business/model/dao/common.go b/business/model/dao/common.go index 188ff3e7f..32a235869 100644 --- a/business/model/dao/common.go +++ b/business/model/dao/common.go @@ -32,9 +32,9 @@ func GetNeedUploadDataResource(db *DaoDB) (dataResList []*model.DataResource, er return dataResList, err } -func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode string) (vendorOrgs []*model.VendorOrgCode, err error) { +func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode, vendorType string) (vendorOrgs []*model.VendorOrgCode, err error) { sql := ` - SELECT vendor_id, vendor_org_code, comment, is_jx_cat + SELECT vendor_id, vendor_org_code, comment, is_jx_cat, is_open FROM vendor_org_code WHERE deleted_at = ? ` @@ -47,6 +47,10 @@ func GetVendorOrgCode(db *DaoDB, vendorID int, vendorOrgCode string) (vendorOrgs sql += " AND vendor_org_code = ?" sqlParams = append(sqlParams, vendorOrgCode) } + if vendorType != "" { + sql += " AND vendor_type = ?" + sqlParams = append(sqlParams, vendorType) + } err = GetRows(db, &vendorOrgs, sql, sqlParams) return vendorOrgs, err } diff --git a/business/model/vendor_org_code.go b/business/model/vendor_org_code.go index 222391989..c286b12e2 100644 --- a/business/model/vendor_org_code.go +++ b/business/model/vendor_org_code.go @@ -1,5 +1,10 @@ package model +const ( + VendorOrgTypePlatform = "platform" //外卖平台 + VendorOrgTypeDelivery = "delivery" //配送平台 +) + type VendorOrgCode struct { ModelIDCULD @@ -8,7 +13,7 @@ type VendorOrgCode struct { Comment string `json:"comment"` //备注 //appkey,secret token等 - Type string `json:"type"` //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表示关 } diff --git a/controllers/sys.go b/controllers/sys.go index 28e6214a2..313aa34ac 100644 --- a/controllers/sys.go +++ b/controllers/sys.go @@ -137,7 +137,7 @@ func (c *SysController) GetEbaiRTFDetail() { // @router /GetVendorOrgCode [get] func (c *SysController) GetVendorOrgCode() { c.callGetVendorOrgCode(func(params *tSysGetVendorOrgCodeParams) (retVal interface{}, errCode string, err error) { - retVal, err = common.GetVendorOrgCode(params.Ctx, params.VendorID, params.VendorOrgCode) + retVal, err = common.GetVendorOrgCode(params.Ctx, params.VendorID, params.VendorOrgCode, model.VendorOrgTypePlatform) return retVal, "", err }) }