Merge branch 'dev' of wugg/cxinv into master

app/admin/controller/OrderInv.php

@@ -694,6 +694,9 @@ class OrderInv extends BaseController{
      if(empty($qrd)){
            return error_show(1004,"未找到开票的销售单信息");
      }
+      $isT= Db::name("invoice_return")->where(["invNo"=>$invNo,"status"=>[0,1,2,5]])->findOrEmpty();
+        if(!empty($isT)) return error_show(1004,"发票退回流程已存在");
+
      $returnCode = makeNo("RIN");
      $data=[
          "returnCode"=>$returnCode,

app/admin/controller/OrderPay.php

@@ -485,6 +485,9 @@ class OrderPay extends BaseController{
         if($tradinfo==false){
            return error_show(1004,"资金信息未找到");
         }
+        $isT= Db::name("trade_return")->where(["logNo"=>$logNo,"tradNo"=>$loginfo['tradNo'],"status"=>[0,1]])
+        ->findOrEmpty();
+        if(!empty($isT)) return error_show(1004,"资金退回流程已存在");
         $reason = isset($this->post['return_reason'])&&$this->post['return_reason']!="" ? trim($this->post['return_reason']):"";
         $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']):"";
         $returnCode =makeNo("RTA");