京西商城100274免配送费
This commit is contained in:
@@ -24,6 +24,8 @@ const (
|
||||
|
||||
PayWaitingTime = 10 * time.Minute // 等待支付的最长时间
|
||||
DingShiDaMinTime = 1 * time.Hour
|
||||
|
||||
specialStoreID = 100274
|
||||
)
|
||||
|
||||
type JxSkuInfo struct {
|
||||
@@ -210,6 +212,10 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
|
||||
now := time.Now()
|
||||
beginDate := utils.Time2Date(now)
|
||||
minDingShiDaTime := now.Add(DingShiDaMinTime)
|
||||
viewShippingFee := "约6.6元配送费"
|
||||
if storeID == specialStoreID {
|
||||
viewShippingFee = "免费配送"
|
||||
}
|
||||
for i := 0; i < 2; i++ {
|
||||
openTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, beginDate)
|
||||
closeTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, beginDate)
|
||||
@@ -222,7 +228,7 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
|
||||
timeInfo.TimeList = append(timeInfo.TimeList, &DeliveryTimeItem{
|
||||
ViewTime: "立即送出",
|
||||
UnixTime: 0,
|
||||
ViewShippingFee: "约6.6元配送费",
|
||||
ViewShippingFee: viewShippingFee,
|
||||
})
|
||||
}
|
||||
deliverTimerList = append(deliverTimerList, timeInfo)
|
||||
@@ -234,7 +240,7 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
|
||||
timeInfo.TimeList = append(timeInfo.TimeList, &DeliveryTimeItem{
|
||||
ViewTime: time2ShortTimeStr(deliveryTime),
|
||||
UnixTime: deliveryTime.Unix(),
|
||||
ViewShippingFee: "约6.6元配送费",
|
||||
ViewShippingFee: viewShippingFee,
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -438,6 +444,9 @@ 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
|
||||
}
|
||||
} else {
|
||||
outJxOrder.FreightPrice = 0
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user