|
|
@@ -107,17 +107,17 @@ class TradePool extends Base
|
|
|
'cancel_fee' =>$trade_fee,
|
|
|
'status' => 2,//认领通过
|
|
|
];
|
|
|
- if($qrdArr->wpay_fee<$trade_fee) throw new \Exception("{$qrdArr->sequenceNo}待支付支付金额不足");
|
|
|
+ if($qrdArr->wpay_fee<$trade_fee) throw new \Exception("{$qrdArr->sequenceNo}待支付金额不足，主单号：{$assoc->cxCode}");
|
|
|
$qrdArr->wpay_fee-= $trade_fee;
|
|
|
$qrdArr->apay_fee+= $trade_fee;
|
|
|
$qrdArr->pay_status= ($qrdArr->wpay_fee==0 &&$qrdArr->pay_fee==0) ?3:2;
|
|
|
$qrdArr->status=1;
|
|
|
$up=$qrdArr->save();
|
|
|
- if(!$up) throw new \Exception($qrdArr->sequenceNo.'订单数据修改失败');
|
|
|
+ if(!$up) throw new \Exception($qrdArr->sequenceNo.'订单数据修改失败，主单号：'.$assoc->cxCode);
|
|
|
$asse= Assoc::create($Asoc);
|
|
|
- if($asse->isEmpty()) throw new \Exception($qrdArr->sequenceNo.'关联数据创建失败');
|
|
|
+ if($asse->isEmpty()) throw new \Exception($qrdArr->sequenceNo.'关联数据创建失败，主单号：'.$assoc->cxCode);
|
|
|
$trade= self::create($temp);
|
|
|
- if($trade->isEmpty()) throw new \Exception($qrdArr->sequenceNo.'资金数据创建失败');
|
|
|
+ if($trade->isEmpty()) throw new \Exception($qrdArr->sequenceNo.'资金数据创建失败，主单号：'.$assoc->cxCode);
|
|
|
$info->relaNo=$trade->logNo;
|
|
|
$info->save();
|
|
|
Log::info('订单数据'.self::getLastSql());
|
|
|
@@ -135,12 +135,12 @@ class TradePool extends Base
|
|
|
->where('a.viceCode',$trade->logNo)
|
|
|
->where(['a.status'=>2,'a.is_del'=>0,'a.type'=>2])
|
|
|
->where('b.cxCode','<>','')
|
|
|
- ->field('a.cancel_fee,a.orderCode,a.viceCode,a.id,a.status')
|
|
|
+ ->field('a.cancel_fee,a.orderCode,a.viceCode,a.id,a.status,b.cxCode')
|
|
|
->findOrEmpty();
|
|
|
if($assoc->isEmpty()) throw new \Exception($trade->logNo.'关联订单数据不存在');
|
|
|
$qrdArr = QrdInfo::where(['sequenceNo'=>$assoc->orderCode,'is_comon'=>0,'is_del'=>0])
|
|
|
->field('totalPrice,wpay_fee,pay_fee,apay_fee,inv_status,platform_type,companyNo,customerNo,sequenceNo,id')->findOrEmpty();
|
|
|
- if($qrdArr->isEmpty()) throw new \Exception($qrdArr->sequenceNo.'订单数据不存在');
|
|
|
+ if($qrdArr->isEmpty()) throw new \Exception($qrdArr->sequenceNo.'订单数据不存在，主单号：'.$assoc->cxCode);
|
|
|
Assoc::CheckTrad( $assoc->viceCode,4);
|
|
|
$returns=[
|
|
|
'returnCode'=>makeNo('RTA'),
|
