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:
苏尹岚
2021-03-11 10:11:29 +08:00
parent cd5356da62
commit 136f54f7fe
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/report/report.go
View File

@@ -546,7 +546,7 @@ func CalculateCoverArea(coordinate []string, vendorID int) (area float64) {
continue continue
} }
var lat, lng float64 var lat, lng float64
if vendorID == model.VendorIDJD { if vendorID == model.VendorIDJD || vendorID == model.VendorIDEBAI {
lng = utils.Str2Float64WithDefault(cell[0], 0) lng = utils.Str2Float64WithDefault(cell[0], 0)
lat = utils.Str2Float64WithDefault(cell[1], 0) lat = utils.Str2Float64WithDefault(cell[1], 0)
} else { } else {

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

@@ -231,7 +231,6 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["shop_id"]), 0)) retVal.ID = int(utils.Str2Int64WithDefault(utils.Interface2String(result["shop_id"]), 0))
retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon retVal.DeliveryRangeType = model.DeliveryRangeTypePolygon
retVal.DeliveryRange = EbaiDeliveryRegion2Jx(result["delivery_region"]) retVal.DeliveryRange = EbaiDeliveryRegion2Jx(result["delivery_region"])
fmt.Println("retVal.DeliveryRange 1111111111111111111111111111111111111", retVal.DeliveryRange)
if retVal.DeliveryRange == "" { if retVal.DeliveryRange == "" {
if list, err := api.EbaiAPI.ShopDeliveryinfoGet("", utils.Str2Int64(vendorStoreID)); err == nil { if list, err := api.EbaiAPI.ShopDeliveryinfoGet("", utils.Str2Int64(vendorStoreID)); err == nil {
retVal.DeliveryRange = EbaiDeliveryRegion2Jx2(list[0]) retVal.DeliveryRange = EbaiDeliveryRegion2Jx2(list[0])