From f5ce85306c9ea899dc30f056a635858817124ca5 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Wed, 23 Jun 2021 10:10:41 +0800 Subject: [PATCH] aa --- business/jxcallback/orderman/orderman_ext.go | 40 ++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 727ad3dc1..4b580d476 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -346,11 +346,12 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro //Data: orders, } if len(orders) > 0 { - task := tasksch.NewParallelTask("RefreshOrderFinancial", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - order := batchItemList[0].(*model.GoodsOrderExt) - var afsOrder *AfsOrderExt - sql := ` + if permission.IsRoled(ctx) { + task := tasksch.NewParallelTask("RefreshOrderFinancial", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + order := batchItemList[0].(*model.GoodsOrderExt) + var afsOrder *AfsOrderExt + sql := ` SELECT t1.afs_total_shop_money, t2.shop_price FROM afs_order t1 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 WHERE t1.afs_order_id = t2.afs_order_id ` - sqlParams := []interface{}{model.AfsOrderStatusFinished, order.VendorOrderID, - model.YES} - if err = dao.GetRow(db, &afsOrder, sql, sqlParams); err == nil && afsOrder != nil { - if afsOrder.AfsTotalShopMoney != 0 { - //报价,要减去商品的京西价 - if order.EarningType == model.EarningTypeQuote { - order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + afsOrder.ShopPrice - } else { - order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2/100) + sqlParams := []interface{}{model.AfsOrderStatusFinished, order.VendorOrderID, + model.YES} + if err = dao.GetRow(db, &afsOrder, sql, sqlParams); err == nil && afsOrder != nil { + if afsOrder.AfsTotalShopMoney != 0 { + //报价,要减去商品的京西价 + if order.EarningType == model.EarningTypeQuote { + order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + afsOrder.ShopPrice + } else { + order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2/100) + } } } - } - return retVal, err - }, orders) - tasksch.HandleTask(task, nil, true).Run() - task.GetResult(0) + return retVal, err + }, orders) + tasksch.HandleTask(task, nil, true).Run() + task.GetResult(0) + } } pagedInfo.Data = orders }