采购单

app/ghs/controllers/PurchaseOrderController.php

@@ -69,9 +69,6 @@ class PurchaseOrderController extends BaseController
         $where['merchantId'] = $this->merchantId;
         $where['shopId'] = $this->shopId;
         $data = PurchaseOrderClass::getOrderList($where);
-        $data['list'] = PurchaseOrderClass::groupSupplierInfo($data['list']);
-        $data['list'] = PurchaseOrderClass::groupAdmin($data['list']);
-
         util::success($data);
     }
 

biz-ghs/base/classes/BaseClass.php

@@ -7,23 +7,5 @@ use bizGhs\admin\classes\AdminClass;
 
 class BaseClass extends \biz\base\classes\BaseClass
 {
-    public static function groupImg($img)
-    {
-        return \Yii::$app->params['imgHost'].$img;
-    }
 
-    public static function groupAdmin($list)
-    {
-        $adminIds = array_column($list,'adminId');
-        $adminData = AdminClass::getByIds($adminIds);
-        if($adminData){
-            $adminData = array_column($adminData,null,'id');
-        }
-        foreach ($list as $k=>$v){
-            $list[$k]['adminName'] = $adminData[$v['adminId']]['adminName']??'';
-            $list[$k]['nickName'] = $adminData[$v['adminId']]['nickName']??'';
-            $list[$k]['avatar'] = isset($adminData[$v['adminId']]['avatar'])?self::groupImg($adminData[$v['adminId']]['avatar']):'';
-        }
-        return $list;
-    }
 }

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -2,7 +2,9 @@
 
 namespace bizGhs\order\classes;
 
+use bizGhs\admin\classes\AdminClass;
 use bizGhs\base\classes\BaseClass;
+use bizGhs\merchant\classes\SupplierClass;
 use bizGhs\stock\services\StockRecordService;
 use bizGhs\product\classes\ProductClass;
 use common\components\orderSn;
@@ -131,10 +133,31 @@ class PurchaseOrderClass extends BaseClass
         if (empty($list)) {
             return $data;
         }
-        $data['list'] = $list;
+        $data['list'] = self::groupOrder($list);
         return $data;
     }
 
+    public static function groupOrder($list){
+    	if(empty($list)){
+		    return $list;
+	    }
+	    $supplierIds = array_column($list,'supplierId');
+    	$supplierInfo = SupplierClass::getByIds($supplierIds,null,'id');
+
+    	$adminIds = array_column($list,'adminId');
+	    $adminInfo = AdminClass::getByIds($adminIds,null,'id');
+
+	    foreach($list as $k => $val){
+		    $supplierId = $val['supplierId'] ?? 0;
+		    $list[$k]['upName'] = $supplierInfo[$supplierId]['upName'] ?? '';
+		    $list[$k]['upCover'] = $supplierInfo[$supplierId]['upCover'] ?? '';
+		    $adminId = $val['adminId'] ?? 0;
+		    $list[$k]['adminName'] = $adminInfo[$adminId]['adminName']??'';
+		    $list[$k]['nickName'] = $adminInfo[$adminId]['nickName']??'';
+		    $list[$k]['avatar'] = $adminInfo[$adminId]['avatar'] ?? '';
+	    }
+	    return $list;
+    }
 
     //增加供应商信息
     public static function groupSupplierInfo($list){