This commit is contained in:
suyl
2021-06-23 16:27:54 +08:00
parent cf23588f4c
commit 4f07f32834

View File

@@ -371,13 +371,17 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
sqlParams := []interface{}{model.AfsOrderStatusFinished, order.VendorOrderID,
model.YES}
if err = dao.GetRow(db, &afsOrder, sql, sqlParams); err == nil && afsOrder != nil {
totalShopMoney := order.TotalShopMoney
if afsOrder.AfsTotalShopMoney != 0 {
//报价,要减去商品的京西价
if order.EarningType == model.EarningTypeQuote {
order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage/100))
} else {
order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2/100)
}
totalShopMoney = afsOrder.AfsTotalShopMoney
}
//if afsOrder.AfsTotalShopMoney != 0 {
//报价,要减去商品的京西价
if order.EarningType == model.EarningTypeQuote {
order.JxIncome = totalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage/100))
} else {
order.JxIncome = totalShopMoney * int64(order.OrderPayPercentage/2/100)
//}
}
}
return retVal, err