分享

app-ghs/controllers/OrderController.php

@@ -2175,32 +2175,6 @@ class OrderController extends BaseController
         util::success($info);
     }
 
-    //通过订单获取采购单分享salt ssh 20260521
-    public function actionCgSalt()
-    {
-        $get = Yii::$app->request->get();
-        $id = $get['id'] ?? 0;
-        if (empty($id)) {
-            util::fail('请求参数错误');
-        }
-        $order = OrderClass::getById($id, true);
-        if (empty($order)) {
-            util::fail('没有找到订单');
-        }
-		if($order->mainId != $this->mainId){
-			util::fail('不是你的订单哈。');
-		}
-        $purchaseId = $order->purchaseId ?? 0;
-        if (empty($purchaseId)) {
-            util::fail('没有找到采购单');
-        }
-        $cg = PurchaseClass::getById($purchaseId);
-        if (empty($cg)) {
-            util::fail('没有找到采购单');
-        }
-        util::success(['purchaseId' => $purchaseId, 'cgSalt' => $cg['salt'] ?? '']);
-    }
-
     //获取订单信息 ssh 20240102
     public function actionGetInfoByOrderSn()
     {

biz-ghs/order/classes/OrderClass.php

@@ -1474,6 +1474,18 @@ 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'] ?? '';
@@ -1532,6 +1544,9 @@ class OrderClass extends BaseClass
             $profit = floatval($profit);
             $list[$key]['profit'] = $profit;
 
+            $purchaseId = $val['purchaseId'] ?? 0;
+            $list[$key]['cgSalt'] = !empty($purchaseId) ? ($cgSaltMap[$purchaseId] ?? '') : '';
+
         }
         return $list;
     }