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-23 19:35:28 +08:00
parent 36f6678da1
commit 8a58e2b9ca
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,12 +236,19 @@ 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("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)
outJxOrder.OrderID = utils.Str2Int64(vendorOrderID) outJxOrder.OrderID = utils.Str2Int64(vendorOrderID)
return outJxOrder, err 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 { if outJxOrder.TotalPrice != jxOrder.TotalPrice && jxOrder.IsPriceDefend != model.YES {
return nil, fmt.Errorf("商品或配送信息发生改变，请重新下单") 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) 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) {
outJxOrder.FreightPrice -= int64(discountPrice[0].DeliveryFeeDeductionFee) outJxOrder.FreightPrice -= int64(discountPrice[0].DeliveryFeeDeductionFee)
jxOrder.FreightPrice -= int64(discountPrice[0].DeliveryFeeDeductionFee)
} }
if err == nil { if err == nil {
if jxOrder.OrderType == model.OrderTypeNormal { if jxOrder.OrderType == model.OrderTypeNormal {
outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
jxOrder.TotalPrice = jxOrder.OrderPrice + jxOrder.FreightPrice
var ( var (
tuserID string tuserID string
dicountCards []*model.DiscountCard dicountCards []*model.DiscountCard