From b4849955848d716a18a2e5b7f4d293427c366f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Thu, 31 Oct 2024 15:22:06 +0800
Subject: [PATCH] 1

---
 business/jxcallback/orderman/orderman_ext.go | 68 ++++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go
index 361540a64..f35a86176 100644
--- a/business/jxcallback/orderman/orderman_ext.go
+++ b/business/jxcallback/orderman/orderman_ext.go
@@ -344,12 +344,12 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro
 			//Data:       orders,
 		}
 		if len(orders) > 0 {
-			//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 := `
+			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 (	
@@ -366,39 +366,39 @@ 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 && afsOrder.AfsTotalShopMoney != order.TotalShopMoney {
-							//报价，要减去商品的京西价
-							if order.EarningType == model.EarningTypeQuote {
-								order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage) / int64(100))
-							} 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 && afsOrder.AfsTotalShopMoney != order.TotalShopMoney {
+								//报价，要减去商品的京西价
+								if order.EarningType == model.EarningTypeQuote {
+									order.JxIncome = afsOrder.AfsTotalShopMoney - order.EarningPrice - order.DesiredFee + (afsOrder.ShopPrice * int64(order.OrderPayPercentage) / int64(100))
+								} else {
+									order.JxIncome = afsOrder.AfsTotalShopMoney * int64(order.OrderPayPercentage/2) / 100
+								}
 							}
 						}
-					}
-					// 统计订单的违约金
-					var damages = &struct {
-						Damages int64 `json:"damages"`
-					}{}
-					sqlDamages := ` SELECT SUM(w.desired_fee) damages FROM waybill w WHERE w.vendor_order_id = ? AND w.status = ? AND w.vendor_waybill_id <> ? `
-					paramDamages := []interface{}{order.VendorOrderID, model.OrderStatusCanceled, order.VendorWaybillID}
-					if err := dao.GetRow(db, damages, sqlDamages, paramDamages); err == nil {
-						order.LiquidatedDamages = damages.Damages
-					}
-					return retVal, err
-				}, orders)
-			tasksch.HandleTask(task, nil, true).Run()
-			result, _ := task.GetResult(0)
-			if len(result) > 0 {
-				pagedInfo.Data = result
+						// 统计订单的违约金
+						var damages = &struct {
+							Damages int64 `json:"damages"`
+						}{}
+						sqlDamages := ` SELECT SUM(w.desired_fee) damages FROM waybill w WHERE w.vendor_order_id = ? AND w.status = ? AND w.vendor_waybill_id <> ? `
+						paramDamages := []interface{}{order.VendorOrderID, model.OrderStatusCanceled, order.VendorWaybillID}
+						if err := dao.GetRow(db, damages, sqlDamages, paramDamages); err == nil {
+							order.LiquidatedDamages = damages.Damages
+						}
+						return retVal, err
+					}, orders)
+				tasksch.HandleTask(task, nil, true).Run()
+				result, _ := task.GetResult(0)
+				if len(result) > 0 {
+					pagedInfo.Data = result
+				} else {
+					pagedInfo.Data = orders
+				}
 			} else {
 				pagedInfo.Data = orders
 			}
-			/*	} else {
-				pagedInfo.Data = orders
-			}*/
 		}
 	}
 	return pagedInfo, err