几个接口增加字段has_account字段(是否开通供应商账号)

app/admin/controller/Payment.php

@@ -120,10 +120,15 @@ class Payment extends BaseController
                     `a`.`companyNo` ,
                     `a`.`companyName` ,
                     `b`.`dzNo` AS `dzNo`
-                 ")->select();
-       $data=[];
+                 ")->select()->toArray();
+
+        //校验是否开通了供应商账号
+        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list,'supplierNo')));
+
+        $data=[];
         foreach ($list as $key=>$value){
             $value['ordeNum'] = Db::name("pay_info")->where([["payNo","=",$value["payNo"]],["is_del","=",0]])->count();
+            $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
             $data[]=$value;
         }
         return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
@@ -140,10 +145,8 @@ class Payment extends BaseController
         if($check){
             $condition[]=["apply_id","=",$this->uid];
         }
-        $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime']))
-        :"";
-        $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime']))
-         :"";
+        $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime'])) :"";
+        $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime'])) :"";
         $supplierNo= isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
         $supplierName= isset($post['supplierName'])&&$post['supplierName']!="" ? trim($post['supplierName']) :"";
         $payNo= isset($post['payNo'])&&$post['payNo']!="" ? trim($post['payNo']) :"";
@@ -215,7 +218,11 @@ class Payment extends BaseController
         $count = Db::name("pay")->where($condition)->count();
         $total = ceil($count/$size)>1 ? ceil($count/$size) : 1;
         $page = $page>=$total?intval($total):$page;
-        $list =  Db::name("pay")->where($condition)->page(intval($page),$size)->order("addtime desc")->select();
+        $list =  Db::name("pay")->where($condition)->page(intval($page),$size)->order("addtime desc")->select()->toArray();
+
+        //校验是否开通了供应商账号
+        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list,'supplierNo')));
+
        $data=[];
         foreach ($list as $key=>$value){
             $value['ordeNum'] = Db::name("pay_info")->where([["payNo","=",$value["payNo"]],["is_del","=",0]])->count();
@@ -227,6 +234,7 @@ class Payment extends BaseController
             $value['inv_tag_img']=$tag[2]['tag_img']??'';
             $value['inv_tag_remark']=$tag[2]['tag_remark']??'';
             $value['pay_tag_remark']=$tag[1]['tag_remark']??'';
+            $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
             $data[]=$value;
         }
         return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
@@ -901,9 +909,14 @@ class Payment extends BaseController
         $total = ceil($count/$size);
         $page = $page>=$total?intval($total):$page;
         $list =  Db::name("cgd_info")->where($condition)->page($page,$size)->order('createdTime desc')->select()->toArray();
+
+        //校验是否开通了供应商账号
+        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list,'supplierNo')));
+
         foreach ($list as &$value){
         	$value['goodNum'] =$value['goodNum']- $value['thNum'];
         	$value['sendNum'] =$value['sendNum']- $value['thNum'];
+            $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
         }
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
@@ -1386,12 +1399,14 @@ class Payment extends BaseController
         $list = Db::name("pay_invoice")
             ->alias("a")
             ->leftJoin("pay b","a.payNo=b.payNo")
-            ->field("a.*")
+            ->field("a.*,b.supplierNo")
             ->where($condition)
             ->page($page,$size)
             ->order("addtime desc")
             ->select()
             ->toArray();
+        //校验是否开通了供应商账号
+        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list,'supplierNo')));
         foreach ($list as &$value){
             $invoinfo =Db::name("invoice_info")->where(["hpNo"=>$value['hpNo'],"status"=>1])->find();
             $value['buyer_name'] = $invoinfo['buyer_name']??"";
@@ -1412,6 +1427,8 @@ class Payment extends BaseController
             $value['invoiceType_cn'] = $this->invoiceType[$value['invoiceType']]??'';
             $value['invStatus_cn'] = $this->invStatus[$value['invStatus']]??'';
             $value['item_list'] = isset($invoinfo['item_list']) &&$invoinfo['item_list']!='' ?json_decode($invoinfo['item_list'],true):"";
+            $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
+
         }
 
         //结算invlist这个接口当用payNo筛选的时候，返回列表里需要加一项统计筛选后列表的inv_subtotal_amount、total字段的和
@@ -1639,19 +1656,29 @@ class Payment extends BaseController
 		if($param['returnCode']!="") $condition[]=["a.returnCode","like","%{$param['returnCode']}%"];
 		if($param['payNo']!="") $condition[]=["a.payNo","like","%{$param['payNo']}%"];
 
-		$count=Db::name("pay_return")->alias("a")
-		->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
-		->leftJoin("pay_invoice c","a.orderCode=c.hpNo")
-		->where($condition)
-		->count();
-		$total =ceil($count/$param['size']);
-		$page = $param['page']>=$total? intval($total):intval($param['page']);
-		$list =Db::name("pay_return")->alias("a")
-		->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
-		->leftJoin("pay_invoice c","a.orderCode=c.hpNo")
-		->where($condition)->page($page,intval($param['size']))->order('id desc')
-		->field("a.*,b.supplierNo,b.supplierName,b.companyNo,b.companyName,b.total_fee,b.ainv_fee,b.winv_fee,b.inv_fee,c.inv_fee pay_inv_fee")
-		->select();
+        $count = Db::name("pay_return")
+            ->alias("a")
+            ->leftJoin("pay b", "a.payNo=b.payNo and b.is_del=0")
+            ->leftJoin("pay_invoice c", "a.orderCode=c.hpNo")
+            ->where($condition)
+            ->count();
+        $total = ceil($count / $param['size']);
+        $page = $param['page'] >= $total ? intval($total) : intval($param['page']);
+        $list = Db::name("pay_return")
+            ->alias("a")
+            ->leftJoin("pay b", "a.payNo=b.payNo and b.is_del=0")
+            ->leftJoin("pay_invoice c", "a.orderCode=c.hpNo")
+            ->where($condition)
+            ->page($page, intval($param['size']))
+            ->order('id desc')
+            ->field("a.*,b.supplierNo,b.supplierName,b.companyNo,b.companyName,b.total_fee,b.ainv_fee,b.winv_fee,b.inv_fee,c.inv_fee pay_inv_fee")
+            ->select()
+            ->toArray();
+        //校验是否开通了供应商账号
+        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list, 'supplierNo')));
+        foreach ($list as &$value) {
+            $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
+        }
 		return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 
@@ -1770,19 +1797,31 @@ class Payment extends BaseController
 		if($param['returnCode']!="") $condition[]=["a.returnCode","like","%{$param['returnCode']}%"];
 		if($param['payNo']!="") $condition[]=["a.payNo","like","%{$param['payNo']}%"];
 
-		$count=Db::name("pay_return")->alias("a")
-		->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
-		->leftJoin("pay_payment c","a.orderCode=c.dzNo")
-		->where($condition)
-		->count();
-		$total =ceil($count/$param['size']);
-		$page = $param['page']>=$total? intval($total):intval($param['page']);
-		$list =Db::name("pay_return")->alias("a")
-		->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
-		->leftJoin("pay_payment c","a.orderCode=c.dzNo")
-		->where($condition)->page($page,intval($param['size']))->order('id desc')
-		->field("a.*,b.supplierNo,b.supplierName,b.companyNo,b.companyName,b.total_fee,b.apay_fee,b.wpay_fee,b.pay_fee,c.pay_fee pay_pay_fee")
-		->select();
+        $count = Db::name("pay_return")
+            ->alias("a")
+            ->leftJoin("pay b", "a.payNo=b.payNo and b.is_del=0")
+            ->leftJoin("pay_payment c", "a.orderCode=c.dzNo")
+            ->where($condition)
+            ->count();
+        $total = ceil($count / $param['size']);
+        $page = $param['page'] >= $total ? intval($total) : intval($param['page']);
+        $list = Db::name("pay_return")
+            ->alias("a")
+            ->leftJoin("pay b", "a.payNo=b.payNo and b.is_del=0")
+            ->leftJoin("pay_payment c", "a.orderCode=c.dzNo")
+            ->where($condition)
+            ->page($page, intval($param['size']))
+            ->order('id desc')
+            ->field("a.*,b.supplierNo,b.supplierName,b.companyNo,b.companyName,b.total_fee,b.apay_fee,b.wpay_fee,b.pay_fee,c.pay_fee pay_pay_fee")
+            ->select()
+            ->toArray();
+
+        //校验是否开通了供应商账号
+        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list, 'supplierNo')));
+
+        foreach ($list as &$value) {
+            $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
+        }
 		return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }