From 1661122465720e203127b61f29b0589889821872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?= <邮箱>
Date: Tue, 8 Aug 2023 13:29:25 +0800
Subject: [PATCH] online

---
 mobile/plugins/payment/wxpay.php                  | 11 ++++++++++-
 mobile/source/helpers/dalianpay/config/config.php | 20 ++++++++++----------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/mobile/plugins/payment/wxpay.php b/mobile/plugins/payment/wxpay.php
index fc22016..449f87d 100755
--- a/mobile/plugins/payment/wxpay.php
+++ b/mobile/plugins/payment/wxpay.php
@@ -221,7 +221,16 @@ class wxpay
 
         // 从大连支付接口返回的参数
         $this->parameters["appid"] = $payinfo['appId']; // 公众账号ID
-        $this->parameters["mch_id"] = '563222080502LGB'; // 商户号  sc_test
+
+        // 调用秘钥里的配置文件
+		require_once(BASE_PATH . 'helpers/dalianpay/library/Base.php');
+		$Base = new Base();
+		// 获取配置信息
+		$config = $Base->getConfig();
+        // $this->parameters["mch_id"] = '100018380507D2C'; // 商户号  sc_test
+        $this->parameters["mch_id"] = $config['org_num']; // 商户号  sc_test
+        echo "\r\n success!!!!\r\n";
+        
         // $this->parameters["spbill_create_ip"] = $_SERVER['REMOTE_ADDR']; // 终端ip
         $this->parameters["nonce_str"] = $payinfo['nonceStr']; // 随机字符串
         $this->parameters["sign"] = $payinfo['paySign']; // 签名
diff --git a/mobile/source/helpers/dalianpay/config/config.php b/mobile/source/helpers/dalianpay/config/config.php
index e6cde47..4444d04 100644
--- a/mobile/source/helpers/dalianpay/config/config.php
+++ b/mobile/source/helpers/dalianpay/config/config.php
@@ -3,14 +3,14 @@
 	return array(
 		// 机构号  商户号
 		// 统一支付接口 测试地址
-		// 'pay_url' => 'https://open.dalianpay.cn/payapi/unitorder/pay',
+		'pay_url' => 'https://open.dalianpay.cn/payapi/unitorder/pay',
 		// 统一支付接口
-		'pay_url' => 'https://epay.dalianpay.cn/payapi/unitorder/pay',
-		// 'org_num' => '5503001',
-		'org_num' => '563222080502LGB',
+		// 'pay_url' => 'https://epay.dalianpay.cn/payapi/unitorder/pay',
+		'org_num' => '5503001',
+		// 'org_num' => '100018380507D2C',
 		// 商户号  渠道商户号
-		// 'cusid' => '10147',
-		'cusid' => '100018380507D2C',
+		'cusid' => '10147',
+		// 'cusid' => '563222080502LGB',
 		// 产品
 		'producp' => 'JX0002',
 		// 版本
@@ -34,11 +34,11 @@
 		// 加密方式
 		'signtype' => 'RSA', 
 		// 渠道公钥 测试公钥
-		// 'public_key' => BASE_PATH . 'helpers/dalianpay/cert/channel_public_key.pem',
-		'public_key' => BASE_PATH . 'helpers/dalianpay/cert/online_public_key.pem',
+		'public_key' => BASE_PATH . 'helpers/dalianpay/cert/channel_public_key.pem',
+		// 'public_key' => BASE_PATH . 'helpers/dalianpay/cert/online_public_key.pem',
 		// 商户私钥 测试私钥
-		// 'private_key' => BASE_PATH . 'helpers/dalianpay/cert/cus_private_key.pem',
-		'private_key' => BASE_PATH . 'helpers/dalianpay/cert/online_private_key.pem',
+		'private_key' => BASE_PATH . 'helpers/dalianpay/cert/cus_private_key.pem',
+		// 'private_key' => BASE_PATH . 'helpers/dalianpay/cert/online_private_key.pem',
 
 		// 统一扫码接口 测试地址
 		'scan_url' => 'https://open.dalianpay.cn/payapi/unitorder/scanqrpay',