提交 a10677d3 authored 作者: chengye's avatar chengye

test

上级 c4e048c7
......@@ -86,14 +86,17 @@ class WriteOff extends Controller
//查询是否有未缴费的缴费单存在
$payments = EmPayment::field('payment_id')->where('account_id','=',$invoice->account_id)
->where('balance','>',0)
->whereIn('status','3,4,5,6,8')
->whereIn('status','3,4,5')
->order('payment_id asc')
->select();
if($payments->isEmpty()) {
$account = EmAccount::get(['account_id'=>$invoice->account_id]);
$account->amount -= $invoice->payment_balance;
$account->save();
return '没有销账的缴费单!';
$invoice->is_pay = 1;
$invoice->save();
return '没有找到可销账的缴费单!';
}
}
$paymentIds = [];
......@@ -174,10 +177,10 @@ class WriteOff extends Controller
$result++;
$balanceMode->isUpdate(false)->save();
$this->computerAmount($inv->account_id,$balanceMode->balance);
if($inv->is_pay != 1) $this->computerAmount($inv->account_id,$balanceMode->balance);
}
}
$msg = $result == 0 ? '已审核,没有可销账的账单.' : '已审核,成功销账 '.$result.' 笔账单.';
$msg = $result == 0 ? '已审核,没有找到可销账的缴费单.' : '已审核,成功销账 '.$result.' 笔账单.';
return $msg;
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论