From 2fc12ba443ecc35cbfc347da762b8ed71f695f12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 2 Jun 2022 10:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jx/localjx/order.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 0695a1aa0..c80bfd436 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1010,14 +1010,17 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 // B2B门店，订单不足一千配送费一百 if strings.Contains(storeDetail.BrandName, model.B2BTag) { - outJxOrder.FreightPrice = 10000 // b2b运费一百元 + outJxOrder.FreightPrice = 10000 // b2b运费一百元 } // 订单超过一千配送费优惠(门店运费) discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1) if len(discountPrice) == 1 && outJxOrder.OrderPrice >= int64(discountPrice[0].DeliveryFeeDeductionSill) { - outJxOrder.FreightPrice = outJxOrder.FreightPrice - int64(discountPrice[0].DeliveryFeeDeductionFee) + outJxOrder.FreightPrice = outJxOrder.FreightPrice - int64(discountPrice[0].DeliveryFeeDeductionFee) + } + // ?????????????????????? 测试 + if storeDetail.ID == 668470 { + outJxOrder.FreightPrice = 1 } - if err == nil { if jxOrder.OrderType == model.OrderTypeNormal { outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice @@ -1397,7 +1400,7 @@ func CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) if err != nil { errList.AddErr(err) } - }else if orderPay.PayType == model.PayTypeTicTok { + } else if orderPay.PayType == model.PayTypeTicTok { orderPayRefund, err = RefundOrderByTT(ctx, orderPay, refundID, orderPay.TotalFee, reason) if err != nil { errList.AddErr(err)