|
|
@@ -52,13 +52,13 @@ class Payment extends BaseController
|
|
|
// }
|
|
|
$page = isset($post['page'])&&$post['page']!="" ? intval($post['page']) :1;
|
|
|
$size = isset($post['size'])&&$post['size']!="" ? intval($post['size']) :10;
|
|
|
- $count = Db::name("pay")->alias('a')
|
|
|
- ->join("cfp_pay_payment b","`a`.`payNo` = `b`.`payNo` AND b.is_del = 0 ",'left')
|
|
|
+ $count = Db::name("pay_ment")->alias('b')
|
|
|
+ ->join("pay a","`a`.`payNo` = `b`.`payNo` AND b.is_del = 0 ",'left')
|
|
|
->where($condition)->count();
|
|
|
$total = ceil($count/$size)>1 ? ceil($count/$size) : 1;
|
|
|
$page = $page>=$total?intval($total):$page;
|
|
|
- $list = Db::name("pay")->alias('a')
|
|
|
- ->join("cfp_pay_payment b","`a`.`payNo` = `b`.`payNo` AND ( `b`.`is_del` = 0 ) ",'left')
|
|
|
+ $list = Db::name("pay_payment")->alias('b')
|
|
|
+ ->join("pay a","`a`.`payNo` = `b`.`payNo` AND ( `b`.`is_del` = 0 ) ",'left')
|
|
|
->where($condition)->page(intval($page),$size)->order("b.addtime desc")
|
|
|
->field(" `b`.`id` AS `id`,
|
|
|
`a`.`payNo` AS `payNo`,
|
