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

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

@@ -445,18 +445,20 @@ 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 {
points := jxutils.CoordinateStr2Points(storeInfo.DeliveryRange) if storeInfo.DeliveryRange != "" {
area := jxutils.CalcPolygonAreaByLngAndLat(points) points := jxutils.CoordinateStr2Points(storeInfo.DeliveryRange)
goodArea := math.Pi * StoreRangeGoodRadius * StoreRangeGoodRadius area := jxutils.CalcPolygonAreaByLngAndLat(points)
badArea := math.Pi * StoreRangeBadRadius * StoreRangeBadRadius goodArea := math.Pi * StoreRangeGoodRadius * StoreRangeGoodRadius
if area >= goodArea { badArea := math.Pi * StoreRangeBadRadius * StoreRangeBadRadius
finalScore = ItemTotalScore if area >= goodArea {
} else if area <= badArea { finalScore = ItemTotalScore
finalScore = 0 } else if area <= badArea {
} else { finalScore = 0
diff := goodArea - area } else {
ratio := float64(ItemTotalScore) / (goodArea - badArea) diff := goodArea - area
finalScore = ItemTotalScore - int(math.Round(diff*ratio)) ratio := float64(ItemTotalScore) / (goodArea - badArea)
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