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-08-24 18:27:34 +08:00
parent 04f68deb17
commit 6b587796d0
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,6 +277,7 @@ func buildDefendPriceOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, address
IsBuyNowPrice: jxOrder.IsBuyNowPrice, IsBuyNowPrice: jxOrder.IsBuyNowPrice,
Issue: issue, Issue: issue,
IsSuccess: model.NO, //默认是不成功 IsSuccess: model.NO, //默认是不成功
IsPay: model.NO,
} }
dao.WrapAddIDCULDEntity(priceDefendOrder, ctx.GetUserName()) dao.WrapAddIDCULDEntity(priceDefendOrder, ctx.GetUserName())
priceDefendOrder.ActualPayPrice = int64(priceDefendOrder.Count)*priceDefendOrder.DefendPrice + jxOrder.FreightPrice priceDefendOrder.ActualPayPrice = int64(priceDefendOrder.Count)*priceDefendOrder.DefendPrice + jxOrder.FreightPrice
@@ -456,9 +457,10 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
} else { } else {
priceDefendOrders, _ := dao.GetPriceDefendOrder(dao.GetDB(), orderPay.VendorOrderID, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false) priceDefendOrders, _ := dao.GetPriceDefendOrder(dao.GetDB(), orderPay.VendorOrderID, nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false)
if len(priceDefendOrders) > 0 { if len(priceDefendOrders) > 0 {
priceDefendOrders[0].IsPay = model.YES
dao.UpdateEntity(dao.GetDB(), priceDefendOrders[0], "IsPay")
err = nil err = nil
} }
} }
return err return err
} }
@@ -810,7 +812,13 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
// } // }
//如果是守价的订单，需要查询本期中该用户是否已经守价过，如果守价过就只算一次运费 //如果是守价的订单，需要查询本期中该用户是否已经守价过，如果守价过就只算一次运费
priceDefendOrders, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, deliveryAddress.UserID, utils.ZeroTimeValue, utils.ZeroTimeValue, false) priceDefendOrders, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, -1, deliveryAddress.UserID, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
if len(priceDefendOrders) > 0 { flag2 := false
for _, v := range priceDefendOrders {
if v.IsPay == model.YES {
flag2 = true
}
}
if len(priceDefendOrders) > 0 && flag2 {
outJxOrder.FreightPrice = 0 outJxOrder.FreightPrice = 0
} }
} else { } else {