|
@@ -1077,10 +1077,25 @@ class Payment extends BaseController
|
|
|
{
|
|
|
try {
|
|
|
|
|
|
- $data = $this->request->post('list', [], 'trim');
|
|
|
+ $param = $this->request->only(['list', 'companyNo'], 'post', 'trim');
|
|
|
+
|
|
|
+ $validate = Validate::rule([
|
|
|
+ 'list' => 'require|array|max:100',
|
|
|
+ 'companyNo|卖出方公司编号' => 'require|max:255|checkCompanyNo:',
|
|
|
+ ]);
|
|
|
+ $validate->extend('checkCompanyNo', function ($val, $rule, $da) {
|
|
|
+
|
|
|
+ $tmp = Db::name('user_role')
|
|
|
+ ->field('id,status')
|
|
|
+ ->where(['is_del' => 0, 'uid' => $this->uid, 'companyNo' => $val])
|
|
|
+ ->findOrEmpty();
|
|
|
+ if (empty($tmp)) return '账号尚未绑定当前公司';
|
|
|
+ if ($tmp['status'] == 0) return '当前公司已禁用';
|
|
|
+ return true;
|
|
|
+ });
|
|
|
+ if (!$validate->check($param)) throw new Exception($validate->getError());
|
|
|
|
|
|
$val = Validate::rule([
|
|
|
-// '|卖出方公司编号'=>'require|max:255',
|
|
|
'payNo|对账编号' => 'require|max:255',
|
|
|
'invoiceType|发票类型' => 'require|in:' . implode(',', array_values($this->invName)),
|
|
|
'invoiceCode|发票代码' => 'require|max:255',
|
|
@@ -1098,7 +1113,7 @@ class Payment extends BaseController
|
|
|
});
|
|
|
|
|
|
//所有的payNo(对账编码)
|
|
|
- $payNo = array_column($data, 'payNo');
|
|
|
+ $payNo = array_column($param['list'], 'payNo');
|
|
|
|
|
|
$payinfo = Db::name('pay')
|
|
|
->where('is_del', 0)
|
|
@@ -1108,7 +1123,7 @@ class Payment extends BaseController
|
|
|
//$da_insert 批量新增的数据,$payNo_hpNo对账编码=>回票编码
|
|
|
$da_insert = $payNo_hpNo = [];
|
|
|
$date = date('Y-m-d H:i:s');
|
|
|
- foreach ($data as $item) {
|
|
|
+ foreach ($param['list'] as $item) {
|
|
|
|
|
|
if (!$val->check($item)) throw new Exception($val->getError());
|
|
|
|
|
@@ -1116,7 +1131,7 @@ class Payment extends BaseController
|
|
|
if ($payinfo[$item['payNo']]['status'] != 2) throw new Exception('对账单数据未完成审核');
|
|
|
|
|
|
$hpNo = makeNo('hp');
|
|
|
- $data = [
|
|
|
+ $da_insert[] = [
|
|
|
'payNo' => $item['payNo'],
|
|
|
'hpNo' => $hpNo,
|
|
|
'apply_id' => $this->uid,
|
|
@@ -1135,7 +1150,7 @@ class Payment extends BaseController
|
|
|
'addtime' => $date,
|
|
|
'updatetime' => $date
|
|
|
];
|
|
|
- $da_insert[] = $data;
|
|
|
+
|
|
|
$payNo_hpNo[$item['payNo']] = $hpNo;
|
|
|
}
|
|
|
|