From 8274b2e22c530318e92ef3f9cf4f96158d979b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 25 May 2020 11:49:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/store.go | 4 +++- business/partner/purchase/jdshop/store.go | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/model/dao/store.go b/business/model/dao/store.go index 731167a18..cea3c67b6 100644 --- a/business/model/dao/store.go +++ b/business/model/dao/store.go @@ -37,7 +37,8 @@ type StoreDetail struct { DistrictName string `json:"districtName"` CityName string `json:"cityName"` - ProvinceName string `json:"provinceName"` //省名 + ProvinceName string `json:"provinceName"` //省名 + JdCode int `json:"jdCode"` JdsCode int `json:"jdsCode"` //京东商城地址代码 JdsStreetCode int `json:"jdsStreetCode"` //京东商城直辖市街道code JdsStreetName string `json:"jdsStreetName"` //京东商城直辖市街道 @@ -104,6 +105,7 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto province.name province_name, district.name district_name, district.jds_code jds_code, + district.jd_code jd_code, city.name city_name, IF(mm.name <> '', mm.name, mm.user_id2) market_man_name, IF(om.name <> '', om.name, om.user_id2) operator_name, diff --git a/business/partner/purchase/jdshop/store.go b/business/partner/purchase/jdshop/store.go index e3439c52f..fb638620d 100644 --- a/business/partner/purchase/jdshop/store.go +++ b/business/partner/purchase/jdshop/store.go @@ -107,6 +107,9 @@ func (p *PurchaseHandler) CreateStore2(db *dao.DaoDB, storeID int, userName stri if store.JdsStreetCode != 0 { createEntityStoreParam.AddCode = store.JdsStreetCode } + if createEntityStoreParam.AddCode == 0 { + createEntityStoreParam.AddCode = store.JdCode + } vendorStoreID, err = api.JdShopAPI.CreateEntityStore(createEntityStoreParam) return vendorStoreID, err }