From b9f1fffa79cca502bf2df6a577c882e0f8a3da4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 23 May 2022 19:05:41 +0800 Subject: [PATCH] 1 --- business/partner/purchase/jx/localjx/order.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index a7cb5d905..962fcc670 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -242,9 +242,9 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, outJxOrder.OrderID = utils.Str2Int64(vendorOrderID) return outJxOrder, err } - //if outJxOrder.TotalPrice != jxOrder.TotalPrice && jxOrder.IsPriceDefend != model.YES { - // return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") - //} + if outJxOrder.TotalPrice != jxOrder.TotalPrice && jxOrder.IsPriceDefend != model.YES { + return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") + } if jxOrder.IsPriceDefend == model.YES { outJxOrder.OrderID = jxOrder.OrderID } else { @@ -1005,6 +1005,8 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1) if len(discountPrice) == 1 && outJxOrder.OrderPrice >= int64(discountPrice[0].DeliveryFeeDeductionSill) { outJxOrder.FreightPrice -= int64(discountPrice[0].DeliveryFeeDeductionFee) + jxOrder.FreightPrice -= int64(discountPrice[0].DeliveryFeeDeductionFee) + jxOrder.TotalPrice -= int64(discountPrice[0].DeliveryFeeDeductionFee) } if err == nil {