|
@@ -404,13 +404,7 @@ class MasterWorkerLogic extends BaseLogic
|
|
|
}
|
|
}
|
|
|
$order = MasterWorkerRetentionMoneyOrder::where(['worker_id'=>$params['worker_id']])->order('id','desc')->findOrEmpty();
|
|
$order = MasterWorkerRetentionMoneyOrder::where(['worker_id'=>$params['worker_id']])->order('id','desc')->findOrEmpty();
|
|
|
|
|
|
|
|
- if ($is_reg == 1 && !$order->isEmpty() ) {
|
|
|
|
|
- $masterWorker = MasterWorker::where(['id' => $params['worker_id']])->field('id,real_name,mobile')->findOrEmpty()->toArray();
|
|
|
|
|
- $order->real_name = $masterWorker['real_name'];
|
|
|
|
|
- $order->mobile = $masterWorker['mobile'];
|
|
|
|
|
- return ['info' => $order->toArray()];
|
|
|
|
|
-
|
|
|
|
|
- } elseif($order->isEmpty() || $order->order_status === 2){
|
|
|
|
|
|
|
+ if($order->isEmpty() || $order->order_status === 2){
|
|
|
$sn = generate_sn(MasterWorkerRetentionMoneyOrder::class, 'sn');
|
|
$sn = generate_sn(MasterWorkerRetentionMoneyOrder::class, 'sn');
|
|
|
$order = MasterWorkerRetentionMoneyOrder::create(['sn' => $sn, 'order_status'=>1,'worker_id'=>$params['worker_id'],'order_amount'=>$order_amount]);
|
|
$order = MasterWorkerRetentionMoneyOrder::create(['sn' => $sn, 'order_status'=>1,'worker_id'=>$params['worker_id'],'order_amount'=>$order_amount]);
|
|
|
}else{
|
|
}else{
|
|
@@ -423,7 +417,9 @@ class MasterWorkerLogic extends BaseLogic
|
|
|
else $is_share = false;
|
|
else $is_share = false;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ $masterWorker = MasterWorker::where(['id' => $params['worker_id']])->field('id,real_name,mobile')->findOrEmpty()->toArray();
|
|
|
|
|
+ $order->real_name = $masterWorker['real_name'];
|
|
|
|
|
+ $order->mobile = $masterWorker['mobile'];
|
|
|
$share_url = $is_share?(env('project.share_retention_money_host','').'?id='.$order->id):'';
|
|
$share_url = $is_share?(env('project.share_retention_money_host','').'?id='.$order->id):'';
|
|
|
return ['info' => $order->toArray(),'share_url' => $share_url];
|
|
return ['info' => $order->toArray(),'share_url' => $share_url];
|
|
|
}
|
|
}
|