|
|
@@ -279,10 +279,13 @@ class OrderPay extends BaseController{
|
|
|
if($status!==""){
|
|
|
$condition[]=["status","=",$status];
|
|
|
}
|
|
|
- $count=Db::name("trade")->where($condition)->count();
|
|
|
+ $count=Db::name("trade")->where($condition)->count();
|
|
|
$total=ceil($count/$size);
|
|
|
$page=$page>$total? intval($total):$page;
|
|
|
$list =Db::name("trade")->where($condition)->page($page,$size)->order("addtime desc")->select();
|
|
|
+ foreach ($list as &$value){
|
|
|
+ $value['child']=Db::name("trade_pool")->where(["tradNo"=>$value['tradNo'],"is_del"=>0])->order("addtime desc")->select()->toArray();
|
|
|
+ }
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
}
|
|
|
// 认领资金列表明细
|
