liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-06-23 10:10:41 +08:00
parent 2daf502fa4
commit f5ce85306c
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
business/jxcallback/orderman/orderman_ext.go
View File

@@ -346,11 +346,12 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
//Data: orders, //Data: orders,
} }
if len(orders) > 0 { if len(orders) > 0 {
task := tasksch.NewParallelTask("RefreshOrderFinancial", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, if permission.IsRoled(ctx) {
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { task := tasksch.NewParallelTask("RefreshOrderFinancial", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
order := batchItemList[0].(*model.GoodsOrderExt) func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
var afsOrder *AfsOrderExt order := batchItemList[0].(*model.GoodsOrderExt)
sql := ` var afsOrder *AfsOrderExt
sql := `
SELECT t1.afs_total_shop_money, t2.shop_price SELECT t1.afs_total_shop_money, t2.shop_price
FROM afs_order t1 FROM afs_order t1
LEFT JOIN ( LEFT JOIN (
@@ -367,22 +368,23 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
GROUP BY 1) t2 ON t1.afs_order_id = t2.afs_order_id GROUP BY 1) t2 ON t1.afs_order_id = t2.afs_order_id
WHERE t1.afs_order_id = t2.afs_order_id WHERE t1.afs_order_id = t2.afs_order_id
` `
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 {
if afsOrder.AfsTotalShopMoney != 0 { if afsOrder.AfsTotalShopMoney != 0 {
//报价，要减去商品的京西价 //报价，要减去商品的京西价
if order.EarningType == model.EarningTypeQuote { if order.EarningType == model.EarningTypeQuote {
order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + afsOrder.ShopPrice order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + afsOrder.ShopPrice
} else { } else {
order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2/100) order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2/100)
}
} }
} }
} return retVal, err
return retVal, err }, orders)
}, orders) tasksch.HandleTask(task, nil, true).Run()
tasksch.HandleTask(task, nil, true).Run() task.GetResult(0)
task.GetResult(0) }
} }
pagedInfo.Data = orders pagedInfo.Data = orders
} }