进场图片

application/api_broker/service/OrderLogService.php

@@ -340,7 +340,7 @@ class OrderLogService
         remark,transfer_img,real_money,source,create_time";
         $payLogData = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, ["order_id" => $order_id]);
         if (count($payLogData) > 0) {
-            $sortPayLogData = $this->arr2tree($payLogData,2);
+            $sortPayLogData = $this->arr2tree($payLogData);
             foreach ($sortPayLogData as $k => $v) {
                 $v["step_name"] = "pay_log";
                 $v["img_path"] = CHAT_IMG_URL;
@@ -422,10 +422,10 @@ class OrderLogService
         $field_march_in = "id,reception_id,reception_name,report_id,order_no,march_in_remark,march_in_img,march_in_area,create_time";
         $marchInData = $oMarchInModel->selectMarchInByOrderNo($field_march_in, ["order_id" => $order_id]);
         if (count($marchInData) > 0) {
-            $marchInData = $this->arr2tree($marchInData,1);
             foreach ($marchInData as $k => $v) {
-                $v["step_name"] = "march_in";
-                $v["img_path"] = CHAT_IMG_URL;
+                $v["step_name"]  = "march_in";
+                $v["img_path"]   = CHAT_IMG_URL;
+                $v["img"]        = $this->getOImg($v["id"],1);
                 $result[$sort++] = $v;
             }
         }
@@ -448,7 +448,7 @@ class OrderLogService
         remark,transfer_img,real_money,source,create_time";
         $payLogData = $oPayLogModel->selectPayLogByOrderNo($field_pay_log, ["order_id" => $order_id]);
         if (count($payLogData) > 0) {
-            $sortPayLogData = $this->arr2tree($payLogData,2);
+            $sortPayLogData = $this->arr2tree($payLogData);
             foreach ($sortPayLogData as $k => $v) {
                 $v["step_name"] = "pay_log";
                 $v["img_path"] = CHAT_IMG_URL;
@@ -482,11 +482,18 @@ class OrderLogService
 
         return $this->sortByTime($result);
     }
-
-    public function arr2tree($list,$img_type)
+    public function getOImg($id,$img_type)
+    {
+        //查询图片
+        $oImgModel = new OImg();
+        $params["img_id"]   = $id;
+        $params["img_type"] = $img_type;
+        $img_arr = $oImgModel->getImgList($params);
+        return $img_arr;
+    }
+    public function arr2tree($list)
     {
         $tree = $trees = [];
-        if($img_type == 2){
             foreach ($list as $key => $item) {
                 if ($item["father_id"] == 0) {
                     $list[$key]["father_id"] = $item["id"];
@@ -494,23 +501,12 @@ class OrderLogService
             }
             foreach ($list as $value) {
                 $tree[$value["father_id"]][] = $value;
-
             }
-        }else{
-            $tree = $list;
-        }
-
-
         foreach ($tree as $i => $v) {
             //查询图片
             $oImgModel = new OImg();
-            if($img_type == 2){
-                $params["img_id"] = $v[0]["father_id"];
-            }else{
-                $params["img_id"] = $v["id"];
-            }
-
-            $params["img_type"] = $img_type;
+            $params["img_id"] = $v[0]["father_id"];
+            $params["img_type"] = 2;
             $img_arr = $oImgModel->getImgList($params);
             $trees[$i]["img"] = $img_arr;
             $trees[$i]["list"] = $v;