liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Store.OriginalName

Browse Source
This commit is contained in:
gazebo
2019-03-27 17:28:22 +08:00
parent 77d6dce549
commit 1996143de6
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/model/store.go
View File

@@ -112,6 +112,7 @@ var (
type Store struct { type Store struct {
ModelIDCULD ModelIDCULD
OriginalName string `orm:"-" json:"originalName"`
Name string `orm:"size(255)" json:"name"` Name string `orm:"size(255)" json:"name"`
CityCode int `orm:"default(0);null" json:"cityCode"` // todo ? CityCode int `orm:"default(0);null" json:"cityCode"` // todo ?
DistrictCode int `orm:"default(0);null" json:"districtCode"` // todo ? DistrictCode int `orm:"default(0);null" json:"districtCode"` // todo ?

3
business/partner/purchase/ebai/store.go
View File

@@ -80,7 +80,8 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
Address: utils.Interface2String(result["address"]), Address: utils.Interface2String(result["address"]),
Tel1: utils.Interface2String(result["phone"]), 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"])) retVal.DeliveryType = EbaiDeliveryType2Jx(utils.Interface2String(result["delivery_type"]))
if result["business_time"] != nil { if result["business_time"] != nil {

3
business/partner/purchase/jd/store.go
View File

@@ -42,7 +42,8 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (*model.Store, error)
Status: JdStoreStatus2JxStatus(result["yn"], result["closeStatus"]), Status: JdStoreStatus2JxStatus(result["yn"], result["closeStatus"]),
Tel1: utils.Interface2String(result["phone"]), 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"]))) retVal.DeliveryType = JdDeliveryType2Jx(int(utils.MustInterface2Int64(result["carrierNo"])))
tel2 := utils.Interface2String(result["mobile"]) tel2 := utils.Interface2String(result["mobile"])

11
business/partner/purchase/mtwm/store.go
View File

@@ -40,7 +40,8 @@ func (p *PurchaseHandler) ReadStore(vendorStoreID string) (retVal *model.Store,
Address: utils.Interface2String(result["address"]), Address: utils.Interface2String(result["address"]),
Tel1: utils.Interface2String(result["phone"]), 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)) openTimes := openTimeMtwm2JX(result["shipping_time"].(string))
if len(openTimes) > 0 { if len(openTimes) > 0 {
@@ -102,12 +103,16 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
if err != nil { if err != nil {
return err return err
} }
remoteStoreInfo, err := api.MtwmAPI.PoiGet(storeDetail.VendorStoreID)
if err != nil {
return err
}
openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}} openTime := [][2]int16{[2]int16{storeDetail.OpenTime1, storeDetail.CloseTime1}}
if storeDetail.OpenTime2 > 0 { if storeDetail.OpenTime2 > 0 {
openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2}) openTime = append(openTime, [2]int16{storeDetail.OpenTime2, storeDetail.CloseTime2})
} }
params := map[string]interface{}{ 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, "address": storeDetail.Address,
"longitude": jxutils.IntCoordinate2Standard(storeDetail.Lng), "longitude": jxutils.IntCoordinate2Standard(storeDetail.Lng),
"latitude": jxutils.IntCoordinate2Standard(storeDetail.Lat), "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 { if globals.EnableStoreWrite && globals.EnableMtwmStoreWrite {
err = api.MtwmAPI.PoiSave(storeDetail.VendorStoreID, params) 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) { func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool) (hint string, err error) {