diff --git a/application/services/OrderDispatchService.php b/application/services/OrderDispatchService.php index 7a9431e..24cd514 100644 --- a/application/services/OrderDispatchService.php +++ b/application/services/OrderDispatchService.php @@ -329,18 +329,21 @@ class OrderDispatchService extends BaseService $orderDispatch = $this->getOrderDispatchInfo($workerId, $params['order_dispatch_id']); $orderDispatch->status = OrderDispatch::STATUS_FINISH; $orderDispatch->images = $this->removeStrCdnUrl($params['complete_images']); - $orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']); - $orderDispatch->offline_total_type = $params['offline_total_type']; $orderDispatch->finish_time = $time; - //线下尾款 - if ($params['final_payment_method'] == 1) { - $orderDispatch->total = $params['amount']; - } + if ($params['receive_type'] === 1) { + $orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']); + $orderDispatch->offline_total_type = $params['offline_total_type']; - //线上尾款 - if ($params['final_payment_method'] == 2) { - $orderDispatch->online_total = $params['amount']; + //线下尾款 + if ($params['final_payment_method'] == 1) { + $orderDispatch->total = $params['amount']; + } + + //线上尾款 + if ($params['final_payment_method'] == 2) { + $orderDispatch->online_total = $params['amount']; + } } $orderDispatch->save(); diff --git a/application/worker/validate/OrderDispatch.php b/application/worker/validate/OrderDispatch.php index 0e01e33..0937eed 100644 --- a/application/worker/validate/OrderDispatch.php +++ b/application/worker/validate/OrderDispatch.php @@ -14,10 +14,12 @@ class OrderDispatch extends Validate 'images|上门图片' => 'require|max:3000', 'complete_images|完成图片' => 'require|max:3000', - 'final_payment_method|收款方式' => 'require|in:1,2', - 'amount|收款金额' => 'require|number|between:0,10000000', - 'payment_image|收款图片' => 'require|max:255', + 'final_payment_method|收款方式' => 'requireIf:receive_type,1|in:1,2', + 'amount|收款金额' => 'requireIf:receive_type,1|number|between:0,10000000', + 'payment_image|收款图片' => 'requireIf:receive_type,1|max:255', 'offline_total_type|尾款收款方' => 'in:0,1,2', + 'receive_type' => 'require|in:1,2', + 'reject_reason|拒接原因' => 'max:100', 'worker_remark|备注信息' => 'max:500', ];