diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 0da14fad9..731167a18 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -35,10 +35,12 @@ type StoreDetail struct { DeliveryCompetition int8 `orm:"default(1)" json:"deliveryCompetition"` // 是否支持配送竞争 IsSync int8 `orm:"default(1)" json:"isSync"` // 是否同步 - DistrictName string `json:"districtName"` - CityName string `json:"cityName"` - ProvinceName string `json:"provinceName"` //省名 - JdsCode int `json:"jdsCode"` //京东商城地址代码 + DistrictName string `json:"districtName"` + CityName string `json:"cityName"` + ProvinceName string `json:"provinceName"` //省名 + JdsCode int `json:"jdsCode"` //京东商城地址代码 + JdsStreetCode int `json:"jdsStreetCode"` //京东商城直辖市街道code + JdsStreetName string `json:"jdsStreetName"` //京东商城直辖市街道 IsAutoOrder int8 `json:"isAutoOrder"` // 平台是否自动接单,-1:否,0:未知,1:是 MarketManName string `json:"marketManName"` //市场负责人 @@ -96,6 +98,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto SELECT t1.*, t2.vendor_store_id, t2.status vendor_status, t2.delivery_fee_deduction_sill, t2.delivery_fee_deduction_fee, t2.sync_status, t2.vendor_org_code, t2.price_percentage, t2.auto_pickup, t2.delivery_type, t2.delivery_competition, t2.is_sync, t2.vendor_store_name, t2.is_order, t2.yb_app_id, t2.yb_app_key, t2.yb_store_prefix, + t2.jds_street_code, t2.jds_street_name, t3.value price_percentage_pack_str, t4.value freight_deduction_pack_str, province.name province_name, diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go index d90e0a4b6..e3439c52f 100644 --- a/business/partner/purchase/jdshop/store.go +++ b/business/partner/purchase/jdshop/store.go @@ -104,6 +104,9 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri CategoryName: jdshopapi.JdsStoreCategoryName, CustomerID: utils.Int2Str(store.ID), } + if store.JdsStreetCode != 0 { + createEntityStoreParam.AddCode = store.JdsStreetCode + } vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam) return vendorStoreID, err }