|
|
@@ -1450,7 +1450,7 @@ class Payment extends BaseController
|
|
|
$total =ceil($count/$param['size']);
|
|
|
$page = $param['page']>=$total? intval($total):intval($param['page']);
|
|
|
$list =Db::name("pay_return")->alias("a")
|
|
|
- ->leftJoin("pay b","a.payNo=b.payNo and is_del=0")
|
|
|
+ ->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']))
|
|
|
->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")
|
|
|
@@ -1564,7 +1564,7 @@ class Payment extends BaseController
|
|
|
if($param['start']!="") $condition[]=["a.addtime",">=",date("Y-m-d H:i:s",strtotime($param['start']))];
|
|
|
if($param['end']!="") $condition[]=["a.addtime","<=",date("Y-m-d 23:59:59",strtotime($param['end']))];
|
|
|
if($param['status']!="") $condition[]=["a.status","=",$param['status']];
|
|
|
- if($param['hpNo']!="") $condition[]=["a.orderCode","=",$param['dzNo']];
|
|
|
+ if($param['dzNo']!="") $condition[]=["a.orderCode","=",$param['dzNo']];
|
|
|
|
|
|
$count=Db::name("pay_return")->alias("a")
|
|
|
->leftJoin("pay b","a.payNo=b.payNo and is_del=0")
|
|
|
@@ -1635,7 +1635,7 @@ class Payment extends BaseController
|
|
|
if($valide->check($param)==false)return error_show(1004,$valide->getError());
|
|
|
$info = Db::name("pay_return")->alias("a")
|
|
|
->leftJoin("pay b","a.payNo=b.payNo and is_del=0")
|
|
|
- ->leftJoin("pay_payment c","a.orderCode=c.hpNo")
|
|
|
+ ->leftJoin("pay_payment c","a.orderCode=c.dzNo")
|
|
|
->where(['returnCode'=>$param['returnCode']])
|
|
|
->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")
|
|
|
->findOrEmpty();
|
