diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index dd170c50d..4cad8b3ce 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -35,7 +35,8 @@ const ( PayWaitingTime = 10 * time.Minute // 等待支付的最长时间 DingShiDaMinTime = 1 * time.Hour - specialStoreID = 100274 + specialStoreID = 100274 + specialFreightPrice = 200 wxAppID = "wx4b5930c13f8b1170" ) @@ -471,12 +472,15 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 outJxOrder.FreightPrice, _, err = delivery.CalculateDeliveryFee(dao.GetDB(), jxOrder.StoreID, "", jxutils.StandardCoordinate2Int(deliveryAddress.Lng), jxutils.StandardCoordinate2Int(deliveryAddress.Lat), model.CoordinateTypeMars, outJxOrder.Weight, checkTime) - if jxOrder.StoreID == specialStoreID { - outJxOrder.FreightPrice = 0 - } + // if jxOrder.StoreID == specialStoreID { + // outJxOrder.FreightPrice = 0 + // } } else { outJxOrder.FreightPrice = 0 } + if outJxOrder.FreightPrice > specialFreightPrice { + outJxOrder.FreightPrice = specialFreightPrice + } if outJxOrder.OrderPrice >= int64(storeDetail.DeliveryFeeDeductionSill) { outJxOrder.FreightPrice -= int64(storeDetail.DeliveryFeeDeductionFee) if outJxOrder.FreightPrice < 0 {