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

修改

Browse Source
This commit is contained in:
Rosy-zhudan
2019-09-17 08:41:13 +08:00
parent 299444ddd5
commit 05809c3a50
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/misc/store_score.go
View File

@@ -445,6 +445,7 @@ func ScoreStoreRange(storeInfo *cms.StoreExt) {
finalScore := 0 finalScore := 0
storeID := storeInfo.ID storeID := storeInfo.ID
if storeInfo.DeliveryRangeType == model.DeliveryRangeTypePolygon { if storeInfo.DeliveryRangeType == model.DeliveryRangeTypePolygon {
if storeInfo.DeliveryRange != "" {
points := jxutils.CoordinateStr2Points(storeInfo.DeliveryRange) points := jxutils.CoordinateStr2Points(storeInfo.DeliveryRange)
area := jxutils.CalcPolygonAreaByLngAndLat(points) area := jxutils.CalcPolygonAreaByLngAndLat(points)
goodArea := math.Pi * StoreRangeGoodRadius * StoreRangeGoodRadius goodArea := math.Pi * StoreRangeGoodRadius * StoreRangeGoodRadius
@@ -458,6 +459,7 @@ func ScoreStoreRange(storeInfo *cms.StoreExt) {
ratio := float64(ItemTotalScore) / (goodArea - badArea) ratio := float64(ItemTotalScore) / (goodArea - badArea)
finalScore = ItemTotalScore - int(math.Round(diff*ratio)) finalScore = ItemTotalScore - int(math.Round(diff*ratio))
} }
}
} else if storeInfo.DeliveryRangeType == model.DeliveryRangeTypeRadius { } else if storeInfo.DeliveryRangeType == model.DeliveryRangeTypeRadius {
deliveryRadius := utils.Str2Float64WithDefault(storeInfo.DeliveryRange, 0) / 1000 deliveryRadius := utils.Str2Float64WithDefault(storeInfo.DeliveryRange, 0) / 1000
if deliveryRadius >= StoreRangeGoodRadius { if deliveryRadius >= StoreRangeGoodRadius {