|
@@ -30,12 +30,14 @@ class Payment extends Base{
|
|
$payNo=makeNo("PAY");
|
|
$payNo=makeNo("PAY");
|
|
$payinfo = [];
|
|
$payinfo = [];
|
|
$totalPrice='0';
|
|
$totalPrice='0';
|
|
|
|
+ $wpay_fee = 0;
|
|
|
|
+ $winv_fee=0;
|
|
foreach ($cgdlist as $k=>$v){
|
|
foreach ($cgdlist as $k=>$v){
|
|
$temp= [
|
|
$temp= [
|
|
"cgdNo"=>$v['sequenceNo'],
|
|
"cgdNo"=>$v['sequenceNo'],
|
|
"total_fee"=>$v['totalPrice'],
|
|
"total_fee"=>$v['totalPrice'],
|
|
- "wapy_fee"=>$v['totalPrice'],
|
|
|
|
- "winv_fee"=>$v['totalPrice'],
|
|
|
|
|
|
+ "wapy_fee"=>$v['totalPrice']- $v['pay_tag_fee'],
|
|
|
|
+ "winv_fee"=>$v['totalPrice']- $v['inv_tag_fee'],
|
|
"payNo"=>$payNo
|
|
"payNo"=>$payNo
|
|
];
|
|
];
|
|
if (!isset($orderCate[$v['sequenceNo']])) return error("采购单{$v['sequenceNo']}数据商品进项类目不存在");
|
|
if (!isset($orderCate[$v['sequenceNo']])) return error("采购单{$v['sequenceNo']}数据商品进项类目不存在");
|
|
@@ -43,6 +45,8 @@ class Payment extends Base{
|
|
if($v['status']==2) return error("采购单{$v['sequenceNo']}数据不结算");
|
|
if($v['status']==2) return error("采购单{$v['sequenceNo']}数据不结算");
|
|
$payinfo[]=$temp;
|
|
$payinfo[]=$temp;
|
|
$totalPrice+=$v['totalPrice'];
|
|
$totalPrice+=$v['totalPrice'];
|
|
|
|
+ $wpay_fee+=$v['totalPrice']-$v['pay_tag_fee'];
|
|
|
|
+ $winv_fee+=$v['totalPrice']-$v['inv_tag_fee'];
|
|
}
|
|
}
|
|
$paydata=[
|
|
$paydata=[
|
|
'payNo'=>$payNo,
|
|
'payNo'=>$payNo,
|
|
@@ -54,10 +58,10 @@ class Payment extends Base{
|
|
'supplierName'=>Supplier::where('code',$supplier[0])->value("name",''),
|
|
'supplierName'=>Supplier::where('code',$supplier[0])->value("name",''),
|
|
'companyNo'=>$company[0],
|
|
'companyNo'=>$company[0],
|
|
'companyName'=>Business::where("companyNo",$company[0])->value("company",""),
|
|
'companyName'=>Business::where("companyNo",$company[0])->value("company",""),
|
|
- 'wpay_fee'=>$totalPrice,
|
|
|
|
|
|
+ 'wpay_fee'=>$wpay_fee,
|
|
'apay_fee'=>0,
|
|
'apay_fee'=>0,
|
|
- 'ainv_fee'=>$totalPrice,
|
|
|
|
- 'winv_fee'=>0,
|
|
|
|
|
|
+ 'ainv_fee'=>0,
|
|
|
|
+ 'winv_fee'=>$winv_fee,
|
|
'remark'=>'',
|
|
'remark'=>'',
|
|
'status'=>1,
|
|
'status'=>1,
|
|
];
|
|
];
|