From 2d136afeb83682da803abbc21f9e7ce92ec770ec Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Fri, 22 Nov 2024 17:24:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=A1=8C=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Gh.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/Gh.php b/app/api/controller/Gh.php
index d292958e..ec440f72 100644
--- a/app/api/controller/Gh.php
+++ b/app/api/controller/Gh.php
@@ -182,18 +182,19 @@ class Gh extends Api
         }
         $checkPay = $this->payReturnCheck($abutment['out_trade_no']);
         if($checkPay['return_msg'] === "SUCCESS"){
-            Db::name("abutment_log")
-                ->where("seq_no",$abutment['seq_no'])
-                ->update(['state'=>1]);
-            Db::name("distribution_pay")
-                ->where("alog_id",$alog_id)
-                ->update(['pay_status'=>1]);
             // 解冻查询
             $r = json_decode($checkPay['order_submit_act_output'],true);
             $jd = $this->jiedong($r);
             if(!$jd){
                 return JsonServer::error('解冻失败');
             }
+            Db::name("abutment_log")
+                ->where("seq_no",$abutment['seq_no'])
+                ->update(['state'=>1]);
+            Db::name("distribution_pay")
+                ->where("alog_id",$alog_id)
+                ->update(['pay_status'=>1]);
+
         }else{
             return JsonServer::error('支付失败');
         }
@@ -248,7 +249,7 @@ class Gh extends Api
         if(!$billions_result){
             return JsonServer::error('支付失败');
         }
-
+        return JsonServer::success('回调成功');
     }
     // 用户账户
     public function userAccount($user_id,$out,$money,$merchant,$user_msg){