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:05:41 +08:00
parent 55034ac50f
commit b9f1fffa79
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,9 +242,9 @@ func CreateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64,
outJxOrder.OrderID = utils.Str2Int64(vendorOrderID) outJxOrder.OrderID = utils.Str2Int64(vendorOrderID)
return outJxOrder, err return outJxOrder, 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("商品或配送信息发生改变，请重新下单")
//} }
if jxOrder.IsPriceDefend == model.YES { if jxOrder.IsPriceDefend == model.YES {
outJxOrder.OrderID = jxOrder.OrderID outJxOrder.OrderID = jxOrder.OrderID
} else { } else {
@@ -1005,6 +1005,8 @@ 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)
jxOrder.TotalPrice -= int64(discountPrice[0].DeliveryFeeDeductionFee)
} }
if err == nil { if err == nil {