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

京西商城100274免配送费

Browse Source
This commit is contained in:
gazebo
2020-01-31 23:05:44 +08:00
parent 98825dada0
commit 06c97665ed
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
business/partner/purchase/jx/localjx/order.go
View File

@@ -24,6 +24,8 @@ const (
PayWaitingTime = 10 * time.Minute // 等待支付的最长时间 PayWaitingTime = 10 * time.Minute // 等待支付的最长时间
DingShiDaMinTime = 1 * time.Hour DingShiDaMinTime = 1 * time.Hour
specialStoreID = 100274
) )
type JxSkuInfo struct { type JxSkuInfo struct {
@@ -210,6 +212,10 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
now := time.Now() now := time.Now()
beginDate := utils.Time2Date(now) beginDate := utils.Time2Date(now)
minDingShiDaTime := now.Add(DingShiDaMinTime) minDingShiDaTime := now.Add(DingShiDaMinTime)
viewShippingFee := "约6.6元配送费"
if storeID == specialStoreID {
viewShippingFee = "免费配送"
}
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
openTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, beginDate) openTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.OpenTime1, beginDate)
closeTime1 := jxutils.JxOperationTime2TimeByDate(storeDetail.CloseTime1, 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{ timeInfo.TimeList = append(timeInfo.TimeList, &DeliveryTimeItem{
ViewTime: "立即送出", ViewTime: "立即送出",
UnixTime: 0, UnixTime: 0,
ViewShippingFee: "约6.6元配送费", ViewShippingFee: viewShippingFee,
}) })
} }
deliverTimerList = append(deliverTimerList, timeInfo) deliverTimerList = append(deliverTimerList, timeInfo)
@@ -234,7 +240,7 @@ func GetAvailableDeliverTime(ctx *jxcontext.Context, storeID int) (deliverTimerL
timeInfo.TimeList = append(timeInfo.TimeList, &DeliveryTimeItem{ timeInfo.TimeList = append(timeInfo.TimeList, &DeliveryTimeItem{
ViewTime: time2ShortTimeStr(deliveryTime), ViewTime: time2ShortTimeStr(deliveryTime),
UnixTime: deliveryTime.Unix(), 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, "", outJxOrder.FreightPrice, _, err = delivery.CalculateDeliveryFee(dao.GetDB(), jxOrder.StoreID, "",
jxutils.StandardCoordinate2Int(deliveryAddress.Lng), jxutils.StandardCoordinate2Int(deliveryAddress.Lat), jxutils.StandardCoordinate2Int(deliveryAddress.Lng), jxutils.StandardCoordinate2Int(deliveryAddress.Lat),
model.CoordinateTypeMars, outJxOrder.Weight, checkTime) model.CoordinateTypeMars, outJxOrder.Weight, checkTime)
if jxOrder.StoreID == specialStoreID {
outJxOrder.FreightPrice = 0
}
} else { } else {
outJxOrder.FreightPrice = 0 outJxOrder.FreightPrice = 0
} }