|
|
@@ -301,18 +301,25 @@ class OrderPay extends BaseController{
|
|
|
$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()->toArray();
|
|
|
- foreach ($list as &$value){
|
|
|
- $data = Db::name("trade_pool")->alias("a")
|
|
|
- ->leftJoin("assoc b","a.logNo=b.viceCode")
|
|
|
- ->leftJoin("qrd_info c","b.orderCode=c.sequenceNo")
|
|
|
- ->where(["a.tradNo"=>$value['tradNo'],"a.is_del"=>0])
|
|
|
- ->order("a.addtime desc")
|
|
|
- ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.customerName,c.customerNo")
|
|
|
- ->select()->toArray();
|
|
|
- $value['child']=$data;
|
|
|
- $value['companyName']=Db::name("supplier_info")->where(["code"=>$value['companyNo']])->value("name","");
|
|
|
- }
|
|
|
+ $list = Db::name("trade")
|
|
|
+ ->where($condition)
|
|
|
+ ->page($page, $size)
|
|
|
+ ->order(['addtime' => 'desc', 'id' => 'desc'])
|
|
|
+ ->select()
|
|
|
+ ->toArray();
|
|
|
+ foreach ($list as &$value) {
|
|
|
+ $data = Db::name("trade_pool")
|
|
|
+ ->alias("a")
|
|
|
+ ->leftJoin("assoc b", "a.logNo=b.viceCode")
|
|
|
+ ->leftJoin("qrd_info c", "b.orderCode=c.sequenceNo")
|
|
|
+ ->where(["a.tradNo" => $value['tradNo'], "a.is_del" => 0])
|
|
|
+ ->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
|
|
|
+ ->field("a.*,b.orderCode,c.qrdSource,goodNo,goodName,qrdType,c.ownerName,c.ownerid,c.department,c.poCode,c.customerName,c.customerNo")
|
|
|
+ ->select()
|
|
|
+ ->toArray();
|
|
|
+ $value['child'] = $data;
|
|
|
+ $value['companyName'] = Db::name("supplier_info")->where(["code" => $value['companyNo']])->value("name", "");
|
|
|
+ }
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
}
|
|
|
// 认领资金列表明细
|
