hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 平台收款不需要提交收款相关信息

Browse Source
This commit is contained in:
gcd 2025-04-28 23:02:10 +08:00
parent c99ef60788
commit 62df6dda50
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/services/OrderDispatchService.php
View File

@ -329,9 +329,11 @@ class OrderDispatchService extends BaseService
$orderDispatch = $this->getOrderDispatchInfo($workerId, $params['order_dispatch_id']); $orderDispatch = $this->getOrderDispatchInfo($workerId, $params['order_dispatch_id']);
$orderDispatch->status = OrderDispatch::STATUS_FINISH; $orderDispatch->status = OrderDispatch::STATUS_FINISH;
$orderDispatch->images = $this->removeStrCdnUrl($params['complete_images']); $orderDispatch->images = $this->removeStrCdnUrl($params['complete_images']);
$orderDispatch->finish_time = $time;
if ($params['receive_type'] === 1) {
$orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']); $orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']);
$orderDispatch->offline_total_type = $params['offline_total_type']; $orderDispatch->offline_total_type = $params['offline_total_type'];
$orderDispatch->finish_time = $time;
//线下尾款 //线下尾款
if ($params['final_payment_method'] == 1) { if ($params['final_payment_method'] == 1) {
@ -342,6 +344,7 @@ class OrderDispatchService extends BaseService
if ($params['final_payment_method'] == 2) { if ($params['final_payment_method'] == 2) {
$orderDispatch->online_total = $params['amount']; $orderDispatch->online_total = $params['amount'];
} }
}
$orderDispatch->save(); $orderDispatch->save();

8
application/worker/validate/OrderDispatch.php
View File

@ -14,10 +14,12 @@ class OrderDispatch extends Validate
'images|上门图片' => 'require|max:3000', 'images|上门图片' => 'require|max:3000',
'complete_images|完成图片' => 'require|max:3000', 'complete_images|完成图片' => 'require|max:3000',
'final_payment_method|收款方式' => 'require|in:1,2', 'final_payment_method|收款方式' => 'requireIf:receive_type,1|in:1,2',
'amount|收款金额' => 'require|number|between:0,10000000', 'amount|收款金额' => 'requireIf:receive_type,1|number|between:0,10000000',
'payment_image|收款图片' => 'require|max:255', 'payment_image|收款图片' => 'requireIf:receive_type,1|max:255',
'offline_total_type|尾款收款方' => 'in:0,1,2', 'offline_total_type|尾款收款方' => 'in:0,1,2',
'receive_type' => 'require|in:1,2',
'reject_reason|拒接原因' => 'max:100', 'reject_reason|拒接原因' => 'max:100',
'worker_remark|备注信息' => 'max:500', 'worker_remark|备注信息' => 'max:500',
]; ];