From adccc9cb7fe35fbe7574e9479a8d2cfd26b49f17 Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Mon, 1 Mar 2021 16:17:31 +0800
Subject: [PATCH] 1

---
 Application/Sdk/Controller/PayH5Controller.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Application/Sdk/Controller/PayH5Controller.class.php b/Application/Sdk/Controller/PayH5Controller.class.php
index 5a7a2bff..c03e8ea5 100644
--- a/Application/Sdk/Controller/PayH5Controller.class.php
+++ b/Application/Sdk/Controller/PayH5Controller.class.php
@@ -777,13 +777,13 @@ class PayH5Controller extends BaseController{
         }elseif ($pay_info['channel'] == 5) { // 汇付宝
             $request['pay_way'] = self::WX_PAY; // 威富通wx
             
-            $pay['agent_id'] = $pay_info['merno'];//商户号
+            $pay['agent_id'] = $pay_conf['merno'];//商户号
             $pay['order_no'] = $request['pay_order_number'];
             $pay['time'] = date('YmdHis', time());
             $pay['pay_type'] = 30;
             $pay['amount'] = $request['price'];
             $pay['user_ip'] = get_client_ip();
-            $pay['sign_key'] = $pay_info['secret'];//密钥
+            $pay['sign_key'] = $pay_conf['secret'];//密钥
             $pay['payerName'] = iconv("UTF-8", "gb2312//IGNORE", "万盟天下");
             $pay['number'] = 1;
             $pay['goods_note']= "消费-".$request["pay_order_number"];