|
@@ -752,14 +752,8 @@ class ServiceWorkLogic extends BaseLogic
|
|
|
->toArray();
|
|
->toArray();
|
|
|
|
|
|
|
|
//查收工程师提成金额
|
|
//查收工程师提成金额
|
|
|
- if (!empty($params['user_id']) && $result['worker']['type'] == 2) {
|
|
|
|
|
- $result['change_amount'] = "-";
|
|
|
|
|
- $result['settlement_amount'] = "-";
|
|
|
|
|
- $result['add_work_amount'] = "-";
|
|
|
|
|
- } else {
|
|
|
|
|
- $change_amount = MasterWorkerAccountLog::where(['work_sn'=>$result['work_sn'],'action'=>1])->value('change_amount');
|
|
|
|
|
- $result['change_amount'] = !empty($change_amount)?$change_amount:0;
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ $change_amount = MasterWorkerAccountLog::where(['work_sn'=>$result['work_sn'],'action'=>1])->value('change_amount');
|
|
|
|
|
+ $result['change_amount'] = !empty($change_amount)?$change_amount:0;
|
|
|
|
|
|
|
|
//质保金相关金额
|
|
//质保金相关金额
|
|
|
$result['retention'] = MasterWorkerRetentionMoneyLog::where('work_id',$result['id'])->visible(['action','amount'])->select()
|
|
$result['retention'] = MasterWorkerRetentionMoneyLog::where('work_id',$result['id'])->visible(['action','amount'])->select()
|
dongxiaoqin