1
This commit is contained in:
@@ -338,6 +338,9 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
|
|||||||
}
|
}
|
||||||
|
|
||||||
orders, totalCount, err := dao.GetOrders(db, nil, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, "", params, offset, pageSize)
|
orders, totalCount, err := dao.GetOrders(db, nil, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, "", params, offset, pageSize)
|
||||||
|
if orders[0].VendorOrderID == "4033500150064003740" {
|
||||||
|
globals.SugarLogger.Debugf("--------orders := %s", utils.Format4Output(orders, false))
|
||||||
|
}
|
||||||
if err == nil {
|
if err == nil {
|
||||||
pagedInfo = &model.PagedInfo{
|
pagedInfo = &model.PagedInfo{
|
||||||
TotalCount: totalCount,
|
TotalCount: totalCount,
|
||||||
@@ -372,6 +375,14 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
|
|||||||
if afsOrder.AfsTotalShopMoney != 0 && afsOrder.AfsTotalShopMoney != order.TotalShopMoney {
|
if afsOrder.AfsTotalShopMoney != 0 && afsOrder.AfsTotalShopMoney != order.TotalShopMoney {
|
||||||
//报价,要减去商品的京西价
|
//报价,要减去商品的京西价
|
||||||
if order.EarningType == model.EarningTypeQuote {
|
if order.EarningType == model.EarningTypeQuote {
|
||||||
|
if orders[0].VendorOrderID == "4033500150064003740" {
|
||||||
|
globals.SugarLogger.Debugf("--------orders := %s", utils.Format4Output(afsOrder, false))
|
||||||
|
globals.SugarLogger.Debugf("--------afsOrder.AfsTotalShopMoney := %s", utils.Format4Output(afsOrder.AfsTotalShopMoney, false))
|
||||||
|
globals.SugarLogger.Debugf("--------afsOrder.EarningPrice := %s", utils.Format4Output(order.EarningPrice, false))
|
||||||
|
globals.SugarLogger.Debugf("--------afsOrder.DesiredFee := %s", utils.Format4Output(order.DesiredFee, false))
|
||||||
|
globals.SugarLogger.Debugf("--------afsOrder.ShopPrice := %s", utils.Format4Output(afsOrder.ShopPrice, false))
|
||||||
|
globals.SugarLogger.Debugf("--------order.OrderPayPercentage := %s", utils.Format4Output(order.OrderPayPercentage, false))
|
||||||
|
}
|
||||||
order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage) / int64(100))
|
order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage) / int64(100))
|
||||||
} else {
|
} else {
|
||||||
order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2) / 100
|
order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2) / 100
|
||||||
|
|||||||
Reference in New Issue
Block a user