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-05-30 22:44:38 +08:00
parent 85b85e50cc
commit 886cd60929
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/services/OrderDispatchService.php
View File

@ -384,6 +384,18 @@ class OrderDispatchService extends BaseService
$orderDispatch->images = $this->removeStrCdnUrl($params['complete_images']);
$orderDispatch->finish_time = $time;
// 材料相关
$order = $this->getOrderModel()->where('id', $orderDispatch->order_id)->find();
// 是否使用材料
$order->is_material_used = $params['is_material_used'];
if ($order->is_material_used == 1) {
// 材料成本
$order->material_cost = $params['material_cost'];
// 材料凭证图片组
$order->material_images = $this->removeStrCdnUrl($params['material_images']);
$order->save();
}
if ($params['receive_type'] == 1) {
$orderDispatch->image = $this->removeStrCdnUrl($params['payment_image']);
$orderDispatch->offline_total_type = $params['offline_total_type'];

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

@ -27,6 +27,11 @@ class OrderDispatch extends Validate
'is_finish_today|今日完成' => 'require|in:0,1',
'estimated_finish_time|完成时间' => 'require|date',
'work_progress|当前施工进度' => 'max:200',
//材料相关
'is_material_used|是否使用材料' => 'require|in:0,1',
'material_cost|材料成本' => 'requireIf:is_material_used,1|number|between:0,10000000',
'material_images|材料凭证' => 'requireIf:is_material_used,1|max:1000',
];
protected $message = [
@ -39,7 +44,7 @@ class OrderDispatch extends Validate
'info' => ['order_dispatch_id'],
'appointmentTime' => ['order_dispatch_id', 'plan_time'],
'arrivedOnSite' => ['order_dispatch_id', 'images'],
'completeService' => ['order_dispatch_id', 'complete_images', 'offline_total_type', 'amount', 'payment_image', 'offline_total_type'],
'completeService' => ['order_dispatch_id', 'complete_images', 'offline_total_type', 'amount', 'payment_image', 'offline_total_type', 'is_material_used', 'material_cost', 'material_images'],
'saveWorkerRemark' => ['order_dispatch_id', 'worker_remark'],
'updateProgress' => ['order_dispatch_id', 'is_finish_today', 'estimated_finish_time', 'work_progress'],
];