|
|
@@ -331,7 +331,7 @@ class OrderPay extends BaseController{
|
|
|
public function tradeList(){
|
|
|
$page=isset($this->post['page'])&&$this->post['page']!="" ? intval($this->post['page']) :1;
|
|
|
$size=isset($this->post['size'])&&$this->post['size']!="" ? intval($this->post['size']) :15;
|
|
|
- $condition =[["a.is_del","=",0],["b.is_del","=",0]];
|
|
|
+ $condition =[["a.is_del","=",0],["b.is_del","=",0],["c.is_del","=",0],["d.is_del","=",0]];
|
|
|
|
|
|
$name =isset($this->post['name'])&&$this->post['name']!=""? trim($this->post['name']):"";
|
|
|
$bank =isset($this->post['bank'])&&$this->post['bank']!=""? trim($this->post['bank']):"";
|
|
|
@@ -383,14 +383,14 @@ class OrderPay extends BaseController{
|
|
|
}
|
|
|
$count=Db::name("trade_pool")->alias("a")
|
|
|
->leftJoin("trade b","a.tradNo=b.tradNo")
|
|
|
- ->leftJoin("assoc d","a.logNo=d.viceCode")
|
|
|
+ ->leftJoin("assoc d","a.logNo=d.viceCode AND d.type = 2")
|
|
|
->leftJoin("qrd_info c","d.orderCode=c.sequenceNo")
|
|
|
->where($condition)->count();
|
|
|
$total=ceil($count/$size);
|
|
|
$page=$page>$total? intval($total):$page;
|
|
|
$list =Db::name("trade_pool")->alias("a")
|
|
|
->leftJoin("trade b","a.tradNo=b.tradNo")
|
|
|
- ->leftJoin("assoc d","a.logNo=d.viceCode")
|
|
|
+ ->leftJoin("assoc d","a.logNo=d.viceCode AND d.type = 2")
|
|
|
->leftJoin("qrd_info c","d.orderCode=c.sequenceNo")
|
|
|
->where($condition)
|
|
|
->page($page,$size)
|
