优化

biz-ghs/order/classes/OrderClass.php

@@ -1375,6 +1375,32 @@ class OrderClass extends BaseClass
         return ['list' => $list, 'itemStat' => $itemStat];
     }
 
+    /**
+     * 列表分享：批量附加采购单 salt，仅查 purchase 表 id,salt
+     */
+    public static function attachCgSaltForList($list)
+    {
+        if (empty($list)) {
+            return $list;
+        }
+        $purchaseIds = array_unique(array_filter(array_column($list, 'purchaseId')));
+        $cgSaltMap = [];
+        if (!empty($purchaseIds)) {
+            $cgList = PurchaseClass::getByIds($purchaseIds, null, 'id', 'id,salt');
+            foreach ($cgList as $cg) {
+                $cgId = $cg['id'] ?? 0;
+                if (!empty($cgId)) {
+                    $cgSaltMap[$cgId] = $cg['salt'] ?? '';
+                }
+            }
+        }
+        foreach ($list as $key => $val) {
+            $purchaseId = $val['purchaseId'] ?? 0;
+            $list[$key]['cgSalt'] = !empty($purchaseId) ? ($cgSaltMap[$purchaseId] ?? '') : '';
+        }
+        return $list;
+    }
+
     //订单列表 ssh 2021.1.19
     public static function getOrderList($where)
     {
@@ -1408,6 +1434,7 @@ class OrderClass extends BaseClass
 
                 $data['list'][$key]['customAvatarUrl'] = imgUtil::groupImg('');
             }
+            $data['list'] = self::attachCgSaltForList($data['list']);
         }
         return $data;
     }
@@ -1474,18 +1501,6 @@ class OrderClass extends BaseClass
         $customIds = array_unique(array_filter($customIds));
         $customInfoList = CustomClass::getByIds($customIds, null, 'id');
 
-        $purchaseIds = array_unique(array_filter(array_column($list, 'purchaseId')));
-        $cgSaltMap = [];
-        if (!empty($purchaseIds)) {
-            $cgList = PurchaseClass::getByIds($purchaseIds, null, 'id', 'id,salt');
-            foreach ($cgList as $cg) {
-                $cgId = $cg['id'] ?? 0;
-                if (!empty($cgId)) {
-                    $cgSaltMap[$cgId] = $cg['salt'] ?? '';
-                }
-            }
-        }
-
         foreach ($list as $key => $val) {
             $adminId = $val['adminId'] ?? 0;
             $list[$key]['adminName'] = $adminInfo[$adminId]['name'] ?? '';
@@ -1544,11 +1559,8 @@ class OrderClass extends BaseClass
             $profit = floatval($profit);
             $list[$key]['profit'] = $profit;
 
-            $purchaseId = $val['purchaseId'] ?? 0;
-            $list[$key]['cgSalt'] = !empty($purchaseId) ? ($cgSaltMap[$purchaseId] ?? '') : '';
-
         }
-        return $list;
+        return self::attachCgSaltForList($list);
     }
 
     public static function printGroup($current, $content, $showPrice = 1, $fontSizeType = 0)