wugg 5 月之前
父节点
当前提交
82a3ebd4c3
共有 1 个文件被更改,包括 9 次插入5 次删除
  1. 9 5
      app/cxinv/controller/Payment.php

+ 9 - 5
app/cxinv/controller/Payment.php

@@ -30,12 +30,14 @@ class Payment extends Base{
         $payNo=makeNo("PAY");
         $payinfo = [];
         $totalPrice='0';
+        $wpay_fee = 0;
+        $winv_fee=0;
         foreach ($cgdlist as $k=>$v){
             $temp= [
                 "cgdNo"=>$v['sequenceNo'],
                 "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
                 ];
             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']}数据不结算");
             $payinfo[]=$temp;
             $totalPrice+=$v['totalPrice'];
+            $wpay_fee+=$v['totalPrice']-$v['pay_tag_fee'];
+            $winv_fee+=$v['totalPrice']-$v['inv_tag_fee'];
         }
         $paydata=[
                 'payNo'=>$payNo,
@@ -54,10 +58,10 @@ class Payment extends Base{
                 'supplierName'=>Supplier::where('code',$supplier[0])->value("name",''),
                 'companyNo'=>$company[0],
                 'companyName'=>Business::where("companyNo",$company[0])->value("company",""),
-                'wpay_fee'=>$totalPrice,
+                'wpay_fee'=>$wpay_fee,
                 'apay_fee'=>0,
-                'ainv_fee'=>$totalPrice,
-                'winv_fee'=>0,
+                'ainv_fee'=>0,
+                'winv_fee'=>$winv_fee,
                 'remark'=>'',
                 'status'=>1,
             ];