feat: 拒接优化

application/common/model/OrderDispatch.php

@@ -28,4 +28,34 @@ class OrderDispatch extends Model
 
         return $images;
     }
+
+    public function getImagesAttr($val)
+    {
+        $images = explode(',', $val);
+        foreach ($images as $k => $v) {
+            $images[$k] = cdnurl($v, true);
+        }
+
+        return $images;
+    }
+
+    public function getImageAttr($val)
+    {
+        return cdnurl($val, true);
+    }
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

application/services/OrderDispatchService.php

@@ -156,7 +156,7 @@ class OrderDispatchService extends BaseService
                 $orderChangeParams['order'] = $order;
                 $orderChangeParams['role'] = 2;
                 $orderChangeParams['auth'] = $this->getWorkerModel()->find($orderDispatch->worker_id);
-                $orderChangeParams['remark'] = '任务被师傅拒接[OrderDispatchId：' . $orderDispatch->id . ']，订单状态回退';
+                $orderChangeParams['remark'] = "任务被师傅拒接[OrderDispatchId：{$orderDispatch->id}，原因为：{$params['reject_reason']}，订单状态回退";
                 Hook::listen('order_change', $orderChangeParams);
             }
 
@@ -213,6 +213,10 @@ class OrderDispatchService extends BaseService
             'reject_reason',
             'arrive_images',
             'arrive_time',
+            'images',
+            'image',
+            'finish_time',
+            'offline_total_type',
         ];
         $res = $this->getOrderDispatchModel()
             ->with(['orderInfo' => function ($query) use ($orderFields) {

application/worker/validate/OrderDispatch.php

@@ -17,8 +17,8 @@ class OrderDispatch extends Validate
         'final_payment_method|收款方式' => 'require|in:1,2',
         'amount|收款金额' => 'require|number|between:0,10000000',
         'payment_image|收款图片' => 'require|max:255',
-        'offline_total_type|尾款收款方' => 'in:1,2',
+        'offline_total_type|尾款收款方' => 'in:0,1,2',
-        'reject_reason|拒接原因' => 'max:255',
+        'reject_reason|拒接原因' => 'max:100',
     ];
 
     protected $message = [