Browse Source

Merge branch 'master-dev' of wugg/cxinv into master

wugg 2 years ago
parent
commit
50fcf918a9
1 changed files with 1 additions and 1 deletions
  1. 1 1
      app/admin/controller/Payment.php

+ 1 - 1
app/admin/controller/Payment.php

@@ -1754,7 +1754,7 @@ class Payment extends BaseController
 		if($valide->check($param)==false)return error_show(1004,$valide->getError());
 		$hpinfo  =Db::name("pay_payment")->where([["dzNo","=",$param['dzNo']],["is_del","=",0]])->findOrEmpty();
 		if(empty($hpinfo)) return error_show(1004,"付款信息未找到");
-		if($hpinfo['status']!=3)return error_show(1004,"付款信息流程未完成");
+		if(!in_array($hpinfo['status'],[3,4]))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,"付款信息退款流程已存在");
 		$returnCode =makeNo("RP");