From 2df3e2d6c8abdb9063b0cedc4de250063bbab92f Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Wed, 23 Jun 2021 16:31:11 +0800 Subject: [PATCH] aa --- business/jxcallback/orderman/orderman_ext.go | 16 ++++++---------- business/model/dao/dao_order.go | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 8597f9d9e..04087ce0c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -371,17 +371,13 @@ 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 { - 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) - //} + //报价，要减去商品的京西价 + 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) + } } } return retVal, err diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 40f92cb05..7813d2203 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -781,7 +781,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat t5.operator_phone, t5.operator_phone2, t5.operator_phone3, tu1.name operator_name, tu2.name operator_name2, tu3.name operator_name3, t6.vendor_pay_percentage, city.name city_name, district.name district_name - -- ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100)) jx_income`, model.DefaultEarningPricePercentage) + ROUND(IF(t1.earning_type = 1, t1.total_shop_money-t1.earning_price-IFNULL(t2.desired_fee,0), t1.total_shop_money *(t1.order_pay_percentage/2)/100)) jx_income`, model.DefaultEarningPricePercentage) if isIncludeSku { sql += `, IF(t3.jx_sku_id > 0, t3.jx_sku_id, t3.sku_id) sku_id,