Merge remote-tracking branch 'origin/mark' into yonghui

2019-11-27 10:08:12 +08:00
parent 491fddf6ed 53efea0eb4
commit 38b81a320e
1 changed files with 1 additions and 0 deletions
--- a/business/partner/purchase/jx/localjx/order.go
+++ b/business/partner/purchase/jx/localjx/order.go
@@ -352,6 +352,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
 	if outJxOrder.FreightPrice, _, err = delivery.CalculateDeliveryFee(dao.GetDB(), jxOrder.StoreID, "",
 		jxutils.StandardCoordinate2Int(deliveryAddress.Lng), jxutils.StandardCoordinate2Int(deliveryAddress.Lat),
 		model.CoordinateTypeMars, outJxOrder.Weight, checkTime); err == nil {
+		outJxOrder.FreightPrice = 0
 		outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
 		outJxOrder.ActualPayPrice = outJxOrder.TotalPrice
 	}