ad

app/admin/controller/Payment.php

@@ -964,24 +964,28 @@ class Payment extends Base
 
         $page =  isset($post['page'])&&$post['page']!="" ? intval($post['page']) :0;
         $size =  isset($post['size'])&&$post['size']!="" ? intval($post['size']) :10;
-        $count =  Db::name("cgd_info")->where($condition)->count();
-        $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();
+//        $count =  Db::name("cgd_info")->where($condition)->count();
+//        $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();
+        
+        $list = CgdInfo::alias("a")->withJoin(["payInfo"],"left")->where($condition)->order("id","desc")->paginate
+        (["list_rows"=>$size,"page"=>$page]);
 
         //校验是否开通了供应商账号
-        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list,'supplierNo')));
-        $payArr=Db::name('supplier_info')->whereIn('code',array_unique(array_column($list,'supplierNo')))->column('pay_method','code');
-        foreach ($list as &$value){
+        $supplierAr=array_unique(array_column($list->items(),'supplierNo'));
+        $supp_account = check_has_account_by_supplierNos($supplierAr);
+        $payArr=Db::name('supplier_info')->whereIn('code',$supplierAr)->column('pay_method','code');
+        foreach ($list->items() as &$value){
         	$value["pay_type"]=$payArr[$value['supplierNo']]??"";
         	$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]);
+        return app_show(0,"获取成功",["list"=>$list->items(),"count"=>$list->total()]);
     }
 
 

app/admin/model/CgdInfo.php

@@ -10,5 +10,7 @@ use think\Model;
  */
 class CgdInfo extends Model
 {
-    //
+    public function PayInfo(){
+    	return $this->belongsTo(PayInfo::class,"sequenceNo","cgdNo")->where(["is_del"=>0,"status"=>0])->bind(["payNo"]);
+    }
 }