上传附件优化

backend/application/api/controller/Demand.php

@@ -187,7 +187,7 @@ class Demand extends Api
             };
             $list = DemandService::getList($where, $page_size, 'id desc', '', ['user', 'demandContracts', 'demandBiddings', 'winBidding']);
             //已发货的需求集合（发货表），用于开发者视角的发货按钮展示
-            $deliveredDemandIds = OrderShipService::where(['demand_id' => ['in', $list->column('id')]])->column('demand_id');
+            $deliveredDemandIds = OrderShipService::getDeliveredDemandIds($list->column('id'));
             $list = $list->each(function ($item, $key) use ($user_id, $opType, $btnNameFun, $deliveredDemandIds) {
                 $demand_bidding = $item->demand_biddings;
                 $bidUserIds = array_column($demand_bidding, 'user_id');
@@ -253,13 +253,7 @@ class Demand extends Api
                 'name' => urldecode(basename($fl))
             ], $info->files);
             //交付内容（订单发货表，开发者发货后展示）
-            $ship = OrderShipService::where(['demand_id' => $id])->order('id', 'desc')->find();
-            $info->delivery = $ship ? [
-                'images' => json_decode($ship->images, true) ?: [],
-                'files' => json_decode($ship->files, true) ?: [],
-                'remark' => $ship->remark,
-                'delivery_time' => $ship->createtime,
-            ] : null;
+            $info->delivery = OrderShipService::getDemandDelivery($id);
 
             $this->success('', $info);
         } catch (\Exception $e) {