From 8a58e2b9ca52438080f4d08caef4730cebe2aa34 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:35:28 +0800 Subject: [PATCH] 1 --- business/partner/purchase/jx/localjx/order.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index 58639b41d..4872a876a 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -236,12 +236,19 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64, if jxOrder.OrderType == model.OrderTypeMatter { checkMatterDeliveryAddress(deliveryAddress) } + globals.SugarLogger.Debug("outorder====",outJxOrder.TotalPrice,outJxOrder.FreightPrice) + globals.SugarLogger.Debug("jxOrder=====",jxOrder.TotalPrice,jxOrder.FreightPrice) if createType == OrderCreateTypeNormal { if jxOrder.OrderType == model.OrderTypeDefendPrice && jxOrder.IsPriceDefend != model.YES { vendorOrderID := buildDefendPriceOrder(ctx, jxOrder, addressID) outJxOrder.OrderID = utils.Str2Int64(vendorOrderID) return outJxOrder, err } + //discountPrice, err := cms.GetStoreVendorMaps(ctx, nil, jxOrder.StoreID, -1) + //if err != nil { + // return nil, err + //} + if outJxOrder.TotalPrice != jxOrder.TotalPrice && jxOrder.IsPriceDefend != model.YES { return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") } @@ -1005,13 +1012,11 @@ 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) } if err == nil { if jxOrder.OrderType == model.OrderTypeNormal { outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice - jxOrder.TotalPrice = jxOrder.OrderPrice + jxOrder.FreightPrice var ( tuserID string dicountCards []*model.DiscountCard