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

1

Browse Source
This commit is contained in:
邹宗楠
2022-05-24 09:55:57 +08:00
parent f70c82821a
commit 58e130b66a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,8 +236,8 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
if jxOrder.OrderType == model.OrderTypeMatter { if jxOrder.OrderType == model.OrderTypeMatter {
checkMatterDeliveryAddress(deliveryAddress) checkMatterDeliveryAddress(deliveryAddress)
} }
globals.SugarLogger.Debug("outorder====",outJxOrder.TotalPrice,outJxOrder.FreightPrice) globals.SugarLogger.Debug("outorder====", outJxOrder.TotalPrice, outJxOrder.FreightPrice)
globals.SugarLogger.Debug("jxOrder=====",jxOrder.TotalPrice,jxOrder.FreightPrice) globals.SugarLogger.Debug("jxOrder=====", jxOrder.TotalPrice, jxOrder.FreightPrice)
if createType == OrderCreateTypeNormal { if createType == OrderCreateTypeNormal {
if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES { if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES {
vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID) vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID)
@@ -1006,11 +1006,13 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} }
// B2B门店，订单不足一千配送费一百 // B2B门店，订单不足一千配送费一百
globals.SugarLogger.Debug("=====1",jxOrder.StoreID,jxOrder.StoreName,storeDetail.BrandName,outJxOrder.FreightPrice) globals.SugarLogger.Debug("=====1", jxOrder.StoreID, jxOrder.StoreName, storeDetail.BrandName, outJxOrder.FreightPrice)
globals.SugarLogger.Debug("=====3", strings.Contains(storeDetail.BrandName, model.B2BTag), jxOrder.OrderPrice, jxOrder.OrderPrice < 10000)
globals.SugarLogger.Debug("=====4", strings.Contains(storeDetail.BrandName, model.B2BTag) && jxOrder.OrderPrice < 10000 )
if strings.Contains(storeDetail.BrandName, model.B2BTag) && jxOrder.OrderPrice < 10000 { if strings.Contains(storeDetail.BrandName, model.B2BTag) && jxOrder.OrderPrice < 10000 {
outJxOrder.FreightPrice = 10000 // b2b运费一百元 outJxOrder.FreightPrice = 10000 // b2b运费一百元
} }
globals.SugarLogger.Debug("====2",outJxOrder.FreightPrice) globals.SugarLogger.Debug("====2", outJxOrder.FreightPrice)
// 订单超过一千配送费优惠(门店运费) // 订单超过一千配送费优惠(门店运费)
discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1) discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1)
if len(discountPrice) == 1 && outJxOrder.OrderPrice >= int64(discountPrice[0].DeliveryFeeDeductionSill) { if len(discountPrice) == 1 && outJxOrder.OrderPrice >= int64(discountPrice[0].DeliveryFeeDeductionSill) {