|
|
@@ -1443,7 +1443,7 @@ class Payment extends BaseController
|
|
|
if($param['hpNo']!="") $condition[]=["a.orderCode","=",$param['hpNo']];
|
|
|
|
|
|
$count=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)
|
|
|
->count();
|
|
|
@@ -1531,7 +1531,7 @@ class Payment extends BaseController
|
|
|
if(!empty($hpinfo)) return error_show(1004,"付款信息未找到");
|
|
|
if($hpinfo['status']!=3)return error_show(1004,"付款信息流程未完成");
|
|
|
$isR=Db::name("pay_return")->where(["orderCode"=>$param['dzNo'],"status"=>[1,2],"is_del"=>0])->findOrEmpty();
|
|
|
- if(!empty($isR))return error_show(1004,"回票信息退票流程已存在");
|
|
|
+ if(!empty($isR))return error_show(1004,"付款信息退款流程已存在");
|
|
|
$returnCode =makeNo("RP");
|
|
|
$data = [
|
|
|
"returnCode"=>$returnCode,
|
