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

aa

Browse Source
This commit is contained in:
suyl
2021-09-01 17:12:00 +08:00
parent 29cd875c3c de9590fb1b
commit e1dcce0fdf
10 changed files with 246 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -362,32 +362,38 @@ func (p *PurchaseHandler) RefreshAllStoresID(ctx *jxcontext.Context, parentTask
// todo 此函数只考虑了在饿了么侧开店的情况
func EbaiDeliveryType2Jx(deliveryType string) int8 {
spIndex := strings.Index(deliveryType, "|")
elmDeliveryType := utils.Str2Int64(deliveryType[:spIndex])
switch elmDeliveryType {
case ebaiapi.DeliveryTypeElmFengNiaoZS,
ebaiapi.DeliveryTypeElmFengNiaoZSKA,
ebaiapi.DeliveryTypeElmFengNiaoKS,
ebaiapi.DeliveryTypeElmNewRetail,
ebaiapi.DeliveryTypeElmEPeiSong,
ebaiapi.DeliveryTypeElmFengNiaoHybrid,
ebaiapi.DeliveryTypeElmFengNiaoNiubee:
return scheduler.StoreDeliveryTypeByPlatform
case ebaiapi.DeliveryTypeElmXingHuoZBTrial,
ebaiapi.DeliveryTypeElmXingHuoZB,
ebaiapi.DeliveryTypeElmXingHuoZBKA:
return scheduler.StoreDeliveryTypeCrowdSourcing
case ebaiapi.DeliveryTypeElmNone,
ebaiapi.DeliveryTypeElmXingHuoTrial,
ebaiapi.DeliveryTypeElmXingHuo,
ebaiapi.DeliveryTypeElmEBase,
ebaiapi.DeliveryTypeElmXingHuoKA:
return scheduler.StoreDeliveryTypeByStore
default:
return scheduler.StoreDeliveryTypeCrowdSourcing
if deliveryType != "" {
elmDeliveryType := utils.Str2Int64(deliveryType[:spIndex])
switch elmDeliveryType {
case ebaiapi.DeliveryTypeElmFengNiaoZS,
ebaiapi.DeliveryTypeElmFengNiaoZSKA,
ebaiapi.DeliveryTypeElmFengNiaoKS,
ebaiapi.DeliveryTypeElmNewRetail,
ebaiapi.DeliveryTypeElmEPeiSong,
ebaiapi.DeliveryTypeElmFengNiaoHybrid,
ebaiapi.DeliveryTypeElmFengNiaoNiubee:
return scheduler.StoreDeliveryTypeByPlatform
case ebaiapi.DeliveryTypeElmXingHuoZBTrial,
ebaiapi.DeliveryTypeElmXingHuoZB,
ebaiapi.DeliveryTypeElmXingHuoZBKA:
return scheduler.StoreDeliveryTypeCrowdSourcing
case ebaiapi.DeliveryTypeElmNone,
ebaiapi.DeliveryTypeElmXingHuoTrial,
ebaiapi.DeliveryTypeElmXingHuo,
ebaiapi.DeliveryTypeElmEBase,
ebaiapi.DeliveryTypeElmXingHuoKA:
return scheduler.StoreDeliveryTypeByStore
default:
return scheduler.StoreDeliveryTypeCrowdSourcing
}
}
return scheduler.StoreDeliveryTypeCrowdSourcing
}
func EbaiDeliveryRegion2Jx(deliveryRegion interface{}) string {
if deliveryRegion == nil {
return ""
}
realDeliveryRegion := deliveryRegion.([]interface{})
if len(realDeliveryRegion) > 0 {
region := deliveryRegion.([]interface{})[0].(map[string]interface{})["region"].([]interface{})[0].([]interface{})

26
business/partner/purchase/jdshop/store.go
View File

@@ -22,19 +22,21 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
// result, err := api.JdShopAPI.NewInfoList(utils.Str2Int64(vendorStoreID))
// storeDetail.VendorStoreID = vendorStoreID
// storeDetail.Status = JdsStatus2jxStatus(result.StoreStatus)
result2, err := api.JdShopAPI.QueryEntityStore(utils.Str2Int64(vendorStoreID))
if result2 == nil {
return storeDetail, fmt.Errorf("未查询到该平台门店，平台门店ID：[%v]", vendorStoreID)
if vendorStoreID != "" {
result2, _ := api.JdShopAPI.QueryEntityStore(utils.Str2Int64(vendorStoreID))
if result2 == nil {
return storeDetail, fmt.Errorf("未查询到该平台门店，平台门店ID：[%v]", vendorStoreID)
}
storeDetail = &dao.StoreDetail{}
storeDetail.ID = utils.Str2Int(result2.ExStoreID)
storeDetail.Name = result2.StoreName
storeDetail.Address = result2.Address
storeDetail.Tel1 = result2.Phone
storeDetail.DistrictCode = result2.AddrCode
zbs := strings.Split(result2.Coordinate, ",")
storeDetail.Lat = jxutils.StandardCoordinate2Int(utils.Str2Float64(zbs[0]))
storeDetail.Lng = jxutils.StandardCoordinate2Int(utils.Str2Float64(zbs[1]))
}
storeDetail = &dao.StoreDetail{}
storeDetail.ID = utils.Str2Int(result2.ExStoreID)
storeDetail.Name = result2.StoreName
storeDetail.Address = result2.Address
storeDetail.Tel1 = result2.Phone
storeDetail.DistrictCode = result2.AddrCode
zbs := strings.Split(result2.Coordinate, ",")
storeDetail.Lat = jxutils.StandardCoordinate2Int(utils.Str2Float64(zbs[0]))
storeDetail.Lng = jxutils.StandardCoordinate2Int(utils.Str2Float64(zbs[1]))
return storeDetail, err
}