diff --git a/business/model/store.go b/business/model/store.go index 06e52e98c..a0912bfd0 100644 --- a/business/model/store.go +++ b/business/model/store.go @@ -112,6 +112,7 @@ var ( type Store struct { ModelIDCULD + OriginalName string `orm:"-" json:"originalName"` Name string `orm:"size(255)" json:"name"` CityCode int `orm:"default(0);null" json:"cityCode"` // todo ? DistrictCode int `orm:"default(0);null" json:"districtCode"` // todo ? diff --git a/business/partner/purchase/ebai/store.go b/business/partner/purchase/ebai/store.go index 179b2ebc2..ebed102b5 100644 --- a/business/partner/purchase/ebai/store.go +++ b/business/partner/purchase/ebai/store.go @@ -80,7 +80,8 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error) Address: utils.Interface2String(result["address"]), Tel1: utils.Interface2String(result["phone"]), } - _, retVal.Name = jxutils.SplitStoreName(utils.Interface2String(result["name"]), partner.StoreNameSeparator, VendorStorePrefix) + retVal.OriginalName = utils.Interface2String(result["name"]) + _, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix) retVal.DeliveryType = EbaiDeliveryType2Jx(utils.Interface2String(result["delivery_type"])) if result["business_time"] != nil { diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index 82a898fc6..a50aea9a2 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -42,7 +42,8 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error) Status: JdStoreStatus2JxStatus(result["yn"], result["closeStatus"]), Tel1: utils.Interface2String(result["phone"]), } - _, retVal.Name = jxutils.SplitStoreName(utils.Interface2String(result["stationName"]), partner.StoreNameSeparator, VendorStorePrefix) + retVal.OriginalName = utils.Interface2String(result["stationName"]) + _, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix) retVal.DeliveryType = JdDeliveryType2Jx(int(utils.MustInterface2Int64(result["carrierNo"]))) tel2 := utils.Interface2String(result["mobile"]) diff --git a/business/partner/purchase/mtwm/store.go b/business/partner/purchase/mtwm/store.go index bc0d686cc..938dc9e5f 100644 --- a/business/partner/purchase/mtwm/store.go +++ b/business/partner/purchase/mtwm/store.go @@ -40,7 +40,8 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (retVal *model.Store, Address: utils.Interface2String(result["address"]), Tel1: utils.Interface2String(result["phone"]), } - _, retVal.Name = jxutils.SplitStoreName(utils.Interface2String(result["name"]), partner.StoreNameSeparator, VendorStorePrefix) + retVal.OriginalName = utils.Interface2String(result["name"]) + _, retVal.Name = jxutils.SplitStoreName(retVal.OriginalName, partner.StoreNameSeparator, VendorStorePrefix) openTimes := openTimeMtwm2JX(result["shipping_time"].(string)) if len(openTimes) > 0 { @@ -102,12 +103,16 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if err != nil { return err } + remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID) + if err != nil { + return err + } openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}} if storeDetail.OpenTime2 > 0 { openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2}) } params := map[string]interface{}{ - // "name": jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), + "name": utils.Interface2String(remoteStoreInfo["name"]), //jxutils.ComposeStoreName(storeDetail.Store.Name, model.VendorIDMTWM), "address": storeDetail.Address, "longitude": jxutils.IntCoordinate2Standard(storeDetail.Lng), "latitude": jxutils.IntCoordinate2Standard(storeDetail.Lat), @@ -121,7 +126,7 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite { err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) } - return nil + return err } func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {