aa
This commit is contained in:
@@ -371,13 +371,17 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
|
|||||||
sqlParams := []interface{}{model.AfsOrderStatusFinished, order.VendorOrderID,
|
sqlParams := []interface{}{model.AfsOrderStatusFinished, order.VendorOrderID,
|
||||||
model.YES}
|
model.YES}
|
||||||
if err = dao.GetRow(db, &afsOrder, sql, sqlParams); err == nil && afsOrder != nil {
|
if err = dao.GetRow(db, &afsOrder, sql, sqlParams); err == nil && afsOrder != nil {
|
||||||
|
totalShopMoney := order.TotalShopMoney
|
||||||
if afsOrder.AfsTotalShopMoney != 0 {
|
if afsOrder.AfsTotalShopMoney != 0 {
|
||||||
//报价,要减去商品的京西价
|
totalShopMoney = afsOrder.AfsTotalShopMoney
|
||||||
if order.EarningType == model.EarningTypeQuote {
|
}
|
||||||
order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage/100))
|
//if afsOrder.AfsTotalShopMoney != 0 {
|
||||||
} else {
|
//报价,要减去商品的京西价
|
||||||
order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2/100)
|
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
|
return retVal, err
|
||||||
|
|||||||
Reference in New Issue
Block a user