|
|
@@ -1461,7 +1461,7 @@ class Payment extends BaseController
|
|
|
$list =Db::name("pay_return")->alias("a")
|
|
|
->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
|
|
|
->leftJoin("pay_invoice c","a.orderCode=c.hpNo")
|
|
|
- ->where($condition)->page($page,intval($param['size']))
|
|
|
+ ->where($condition)->page($page,intval($param['size']))->order('id desc')
|
|
|
->field("a.*,b.supplierNo,b.supplierName,b.companyNo,b.companyName,b.total_fee,b.ainv_fee,b.winv_fee,b.inv_fee,c.inv_fee pay_inv_fee")
|
|
|
->select();
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
|
|
@@ -1585,7 +1585,7 @@ class Payment extends BaseController
|
|
|
$list =Db::name("pay_return")->alias("a")
|
|
|
->leftJoin("pay b","a.payNo=b.payNo and b.is_del=0")
|
|
|
->leftJoin("pay_payment c","a.orderCode=c.dzNo")
|
|
|
- ->where($condition)->page($page,intval($param['size']))
|
|
|
+ ->where($condition)->page($page,intval($param['size']))->order('id desc')
|
|
|
->field("a.*,b.supplierNo,b.supplierName,b.companyNo,b.companyName,b.total_fee,b.apay_fee,b.wpay_fee,b.pay_fee,c.pay_fee pay_pay_fee")
|
|
|
->select();
|
|
|
return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
|
