|
@@ -101,7 +101,7 @@ class PhOrders extends Base
|
|
|
$this->sendSmsDispatch($data['name'],$data['phone'],$data['org_id'],$orderId);
|
|
|
}
|
|
|
|
|
|
- return $payId;
|
|
|
+ return ['payId'=>$payId,'orderId'=>$orderId];
|
|
|
}
|
|
|
|
|
|
// Base64字符串转文件
|
|
@@ -396,10 +396,10 @@ class PhOrders extends Base
|
|
|
'amount' => input('amount/f',0)
|
|
|
];
|
|
|
|
|
|
- if($data['amount'] <= 0){
|
|
|
- $this->error = '收费金额不能小于0';
|
|
|
- return false;
|
|
|
- }
|
|
|
+// if($data['amount'] <= 0){
|
|
|
+// $this->error = '收费金额不能小于0';
|
|
|
+// return false;
|
|
|
+// }
|
|
|
if(!$data['end']){
|
|
|
$this->error = '未选择服务结束日期';
|
|
|
return false;
|
|
@@ -666,9 +666,12 @@ class PhOrders extends Base
|
|
|
$user_id = Db::name('worker')
|
|
|
->where('id',$v['worker_id'])
|
|
|
->value('user_id');
|
|
|
- $todos[$k]['worker_name'] = Db::name('user')
|
|
|
+ $user = Db::name('user')
|
|
|
->where('id',$user_id)
|
|
|
- ->value('real_name');
|
|
|
+ ->field('real_name,mobile')
|
|
|
+ ->find();
|
|
|
+ $todos[$k]['worker_name'] = $user['real_name'] ?? '';
|
|
|
+ $todos[$k]['phone'] = $user['mobile'] ?? '';
|
|
|
$todos[$k]['end'] = $v['end']? $v['end']:"";
|
|
|
|
|
|
}
|
|
@@ -677,11 +680,27 @@ class PhOrders extends Base
|
|
|
// 获取缴费记录-预收款
|
|
|
$pays = Db::name('ph_order_pay')->where('status',1)->where('bus_type',0)->where('order_id',$id)->select();
|
|
|
$pays = $pays?$pays:[];
|
|
|
+ if (!empty($pays)){
|
|
|
+ $userIds = array_column($pays,'user_id');
|
|
|
+ $users = Db::name('user')->whereIn('id',$userIds)->column('real_name','id');
|
|
|
+ foreach ($pays as &$pay){
|
|
|
+ $pay['name'] = $users[$pay['user_id']] ?? '客户';
|
|
|
+ }
|
|
|
+ unset($pay);
|
|
|
+ }
|
|
|
$info['pays'] = $pays;
|
|
|
|
|
|
// 获取缴费记录-服务费
|
|
|
$pays = Db::name('ph_order_pay')->where('status',1)->where('bus_type',1)->where('order_id',$id)->select();
|
|
|
$pays = $pays?$pays:[];
|
|
|
+ if (!empty($pays)){
|
|
|
+ $userIds = array_column($pays,'user_id');
|
|
|
+ $users = Db::name('user')->whereIn('id',$userIds)->column('real_name','id');
|
|
|
+ foreach ($pays as &$pay){
|
|
|
+ $pay['name'] = $users[$pay['user_id']] ?? '客户';
|
|
|
+ }
|
|
|
+ unset($pay);
|
|
|
+ }
|
|
|
$info['pays2'] = $pays;
|
|
|
$info['serviceFee'] = empty($pays)?0:1;
|
|
|
|
|
@@ -695,6 +714,14 @@ class PhOrders extends Base
|
|
|
->field('a.*')
|
|
|
->select();
|
|
|
$refunds = $refunds?$refunds:[];
|
|
|
+ if (!empty($refunds)){
|
|
|
+ $userIds = array_column($refunds,'user_id');
|
|
|
+ $users = Db::name('user')->whereIn('id',$userIds)->column('real_name','id');
|
|
|
+ foreach ($refunds as &$refund){
|
|
|
+ $refund['name'] = $users[$refund['user_id']] ?? '客户';
|
|
|
+ }
|
|
|
+ unset($refund);
|
|
|
+ }
|
|
|
$info['refunds'] = $refunds;
|
|
|
|
|
|
// 获取服务费退款记录
|
|
@@ -707,6 +734,14 @@ class PhOrders extends Base
|
|
|
->field('a.*')
|
|
|
->select();
|
|
|
$refunds2 = $refunds2?$refunds2:[];
|
|
|
+ if (!empty($refunds2)){
|
|
|
+ $userIds = array_column($refunds2,'user_id');
|
|
|
+ $users = Db::name('user')->whereIn('id',$userIds)->column('real_name','id');
|
|
|
+ foreach ($refunds2 as &$refund2){
|
|
|
+ $refund2['name'] = $users[$refund2['user_id']] ?? '客户';
|
|
|
+ }
|
|
|
+ unset($refund2);
|
|
|
+ }
|
|
|
$info['refunds2'] = $refunds2;
|
|
|
|
|
|
//固定服务费金额
|