From 2d92e7c3cd85e2262d5ec055e7da8584a7e113ad Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Fri, 22 Nov 2024 17:58:06 +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 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/api/controller/Gh.php b/app/api/controller/Gh.php
index 223fa7c8..1b0884e3 100644
--- a/app/api/controller/Gh.php
+++ b/app/api/controller/Gh.php
@@ -80,10 +80,10 @@ class Gh extends Api
         $general2 = $this->general2($user_id,$out,$money,$user_billions,$user_msg,$type);
         $userAccount = "";
         $order_submit_act_input = array($basic,$general1,$general2);
-        if($type != 0){
+        if($type != ""){
             $userAccount = $this->userAccount($user_id,$out,$money,$merchant,$user_msg);
             $order_num = 4;
-            $order_submit_act_input = array($userAccount,$basic,$general1,$general2);
+            $order_submit_act_input = array($basic,$general1,$general2,$userAccount);
         }
 
         $request = [
@@ -167,7 +167,7 @@ class Gh extends Api
         return substr(md5("donglonghui".time().mt_rand(1,1000000)),8,13);
     }
     // 查询回调记录
-    public function checkReturn($alog_id=370,$type=""){
+    public function checkReturn($alog_id,$type=""){
         $abutment = Db::name("abutment_log")
             ->where("alog_id",$alog_id)
             ->where("state",0)
@@ -255,30 +255,30 @@ class Gh extends Api
     }
     // 用户账户
     public function userAccount($user_id,$out,$money,$merchant,$user_msg){
-        $out1 = "dlh".time().$user_id."1";
+        $out4 = "dlh".time().$user_id."4";
         $data1['rec_num'] = "1";
         $data1['seq_no'] = $out;
-        $data1['sub_order_id'] = $out1;
+        $data1['sub_order_id'] = $out4;
         $data1['oper_flag'] = "0";
         $data1['busi_type'] = "1";
-        $data1['sub_mer_id'] = "120448160198";
-        $data1['sub_mer_prtcl_no'] = "1204481601980201";
+        $data1['sub_mer_id'] = "120405000785";
+        $data1['sub_mer_prtcl_no'] = "1204050007850201";
         $data1['classify_amt'] = $money*$merchant;
         $data1['user_id'] = $user_id;
         $data1['open_id'] = $user_msg['openid'];
         $data1['dtime'] = date("Y-m-d H:i:s");
         $rest = Db::name("abutment_log")->save($data1);
         return  array(
-            "rec_num"=>"1",
-            "sub_order_id"=>$out1,
+            "rec_num"=>"4",
+            "sub_order_id"=>$out4,
             "oper_flag"=>"0",
             "busi_type"=>"1",
             "ori_mer_id"=>"120448160200",
             "seq_no"=>$out,
-            "mer_acct"=>"1911025009202050845",
+            "mer_acct"=>"1204068809100156171",
             "ori_trx_date"=>date("Y-m-d"),
-            "sub_mer_id"=>"120448160198",
-            "sub_mer_prtcl_no"=>"1204481601980201",
+            "sub_mer_id"=>"120405000785",
+            "sub_mer_prtcl_no"=>"1204050007850201",
             "classify_amt"=>strval($money*$merchant)
         );
     }