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

删除日志

Browse Source
This commit is contained in:
邹宗楠
2022-10-24 11:22:38 +08:00
parent 5a47102894
commit 5d6a5a3226
139 changed files with 17 additions and 787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
business/partner/delivery/delivery.go
View File

@@ -35,7 +35,6 @@ func CallCreateWaybillPolicy(deliveryFee, maxDeliveryFee int64, order *model.Goo
}
func CalculateDeliveryFee(db *dao.DaoDB, jxStoreID int, hint string, consigneeLng, consigneeLat, coordinateType, weight int, billTime time.Time) (deliveryFee, addFee int64, err error) {
globals.SugarLogger.Debugf("CalculateOrderDeliveryFee orderID:%s", hint)
if db == nil {
db = dao.GetDB()
}
@@ -62,11 +61,9 @@ func CalculateDeliveryFee(db *dao.DaoDB, jxStoreID int, hint string, consigneeLn
deliveryFee = priceInfo.CityPrice
}
if deliveryFee == 0 {
// globals.SugarLogger.Warnf("CalculateOrderDeliveryFee 查不到美团配送价格 orderID:%s", hint)
deliveryFee = 650
}
if lng == 0 || lat == 0 {
globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,门店:%d没有坐标信息", hint, jxStoreID)
return 0, 0, fmt.Errorf("找不到门店:%d的坐标", jxStoreID)
}
lng2, lat2, _ := jxutils.IntCoordinate2MarsStandard(consigneeLng, consigneeLat, coordinateType)
@@ -76,7 +73,7 @@ func CalculateDeliveryFee(db *dao.DaoDB, jxStoreID int, hint string, consigneeLn
// 距离加价
distance := jxutils.WalkingDistance(lng, lat, lng2, lat2)
if distance > warningDistance {
//globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,距离%.3fkm太远,请检查门店坐标信息", hint, distance)
globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,距离%.3fkm太远,请检查门店坐标信息", hint, distance)
}
distanceAddFee = int64(jxutils.CalcStageValue([][]float64{
[]float64{
@@ -95,7 +92,7 @@ func CalculateDeliveryFee(db *dao.DaoDB, jxStoreID int, hint string, consigneeLn
// 重量加价
if weight > warningWeight {
//globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,重量:%dg太重,请检查商品属性", hint, weight)
globals.SugarLogger.Infof("[运营]计算订单配送费orderID:%s,重量:%dg太重,请检查商品属性", hint, weight)
}
weightAddFee = int64(jxutils.CalcStageValue([][]float64{
[]float64{