liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

会员

Browse Source
This commit is contained in:
苏尹岚
2020-09-18 12:01:03 +08:00
parent 6389f4904b
commit 7a51e5675d
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -916,7 +916,10 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
if IsDeliverySelf { if IsDeliverySelf {
outJxOrder.FreightPrice = 0 outJxOrder.FreightPrice = 0
} }
}
if err == nil {
if jxOrder.OrderType == model.OrderTypeNormal {
outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
// 判断用户是否是会员 // 判断用户是否是会员
var ( var (
tuserID string tuserID string
@@ -935,15 +938,13 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
outJxOrder.OrderPrice = outJxOrder.OrderPrice * int64(discountCard.PicePercentage) / 100 outJxOrder.OrderPrice = outJxOrder.OrderPrice * int64(discountCard.PicePercentage) / 100
} }
} }
} outJxOrder.ActualPayPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
if err == nil { } else if jxOrder.OrderType == model.OrderTypeDefendPrice {
if jxOrder.OrderType == model.OrderTypeNormal { outJxOrder.Skus[0].DefendPrice = jxOrder.Skus[0].DefendPrice
} } else {
outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice outJxOrder.TotalPrice = outJxOrder.OrderPrice + outJxOrder.FreightPrice
outJxOrder.ActualPayPrice = outJxOrder.TotalPrice outJxOrder.ActualPayPrice = outJxOrder.TotalPrice
if jxOrder.OrderType == model.OrderTypeDefendPrice {
outJxOrder.Skus[0].DefendPrice = jxOrder.Skus[0].DefendPrice
} }
if jxOrder.UserID != "" { if jxOrder.UserID != "" {
outJxOrder.UserID = jxOrder.UserID outJxOrder.UserID = jxOrder.UserID