From b530e7fe0a307da5af02c97b68169d016307fe07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?= <邮箱>
Date: Thu, 3 Aug 2023 08:50:13 +0800
Subject: [PATCH] test

---
 mobile/dalianpay/demo/pay.php    | 49 ++++++++++++++++++++++------------------
 mobile/plugins/payment/wxpay.php | 26 ++++++++++-----------
 2 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/mobile/dalianpay/demo/pay.php b/mobile/dalianpay/demo/pay.php
index 436adb5..4a8d508 100644
--- a/mobile/dalianpay/demo/pay.php
+++ b/mobile/dalianpay/demo/pay.php
@@ -1,29 +1,34 @@
 <?php
 
-		function encrypt($plaintext) {
-			$length = mb_strlen($plaintext);
-			$ciphertext = '';
-			for ($i = 0; $i < $length; $i += 2) {
-				$ciphertext .= mb_substr($plaintext, $i + 1, 1) . mb_substr($plaintext, $i, 1);
-			}
-			return $ciphertext;
+	function encrypt($plaintext) {
+		$length = mb_strlen($plaintext);
+		$ciphertext = '';
+		for ($i = 0; $i < $length; $i += 2) {
+			$ciphertext .= mb_substr($plaintext, $i + 1, 1) . mb_substr($plaintext, $i, 1);
 		}
+		return $ciphertext;
+	}
 
-		function decrypt($ciphertext) {
-			$length = mb_strlen($ciphertext);
-			$plaintext = '';
-			for ($i = 0; $i < $length; $i += 2) {
-				$plaintext .= mb_substr($ciphertext, $i + 1, 1) . mb_substr($ciphertext, $i, 1);
-			}
-			return $plaintext;
+	function decrypt($ciphertext) {
+		$length = mb_strlen($ciphertext);
+		$plaintext = '';
+		for ($i = 0; $i < $length; $i += 2) {
+			$plaintext .= mb_substr($ciphertext, $i + 1, 1) . mb_substr($ciphertext, $i, 1);
 		}
-	// function pay()
-	// {
+		return $plaintext;
+	}
+	function pay($openid_crypt, $order_sn, $order_amount)
+	{
 		session_start();
 		// $openid = $_SESSION['openid'];
-		$openid = decrypt($_GET['openid']);
-		$reqsn = $_GET['reqsn'];
-		$trxamt = $_GET['trxamt'];
+		// $openid = decrypt($_GET['openid']);
+		// $reqsn = $_GET['reqsn'];
+		// $trxamt = $_GET['trxamt'];
+
+		$openid = decrypt($openid_crypt,);
+		$reqsn = $order_sn;
+		$trxamt = $order_amount;
+		
 		// var_dump($openid);
 		// var_dump($reqsn);
 		// var_dump($trxamt);
@@ -144,13 +149,13 @@
 		// die();
 		var_dump(json_decode($response_data));
 		$_SESSION['response_data_json'] = $response_data;
-		// return $response_data;
+		return $response_data;
 
-		var_dump($_SESSION['user_id']);
+		// var_dump($_SESSION['user_id']);
 		// 跳回之前的地址
 		// header('Location: ' . $redirect_url);
 		// exit;
-	// }
+	}
 
 	// return pay();
 ?>
diff --git a/mobile/plugins/payment/wxpay.php b/mobile/plugins/payment/wxpay.php
index 2dd70c7..c5823bc 100755
--- a/mobile/plugins/payment/wxpay.php
+++ b/mobile/plugins/payment/wxpay.php
@@ -219,25 +219,25 @@ class wxpay
             // header('Location: https://shop.heavenk.com/mobile/blank.php');
             // exit; // 终止当前脚本的执行，确保页面跳转生效
             // $_SESSION['openid'] = $openid;
-            $_SESSION['openid'] = 'oCTanxBeiVFWlekJT_GiPZM2UiGY';  //sc_test
+            $_SESSION['openid'] = 'oCTanxBeiVFWlekJT_GiPZM2UiGY';  //sc_test l or I
         }
         $order_amount = $order['order_amount'] * 100;
 
         // 访问大连支付接口
-        $url = "https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
-        var_dump($url);
-        $_SESSION['prev_url'] = $url;
-        var_dump($_SESSION['prev_url']);
-        header('Location: https://shop.heavenk.com/mobile/dalianpay/demo/pay.php?openid=' . 
-            $this->encrypt($_SESSION['openid']) .
-            '&reqsn=' . $order['order_sn'] . 
-            '&trxamt=' . $order_amount
-        );
+        // $url = "https://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]";
+        // var_dump($url);
+        // $_SESSION['prev_url'] = $url;
+        // var_dump($_SESSION['prev_url']);
+        // header('Location: https://shop.heavenk.com/mobile/dalianpay/demo/pay.php?openid=' . 
+        //     $this->encrypt($_SESSION['openid']) .
+        //     '&reqsn=' . $order['order_sn'] . 
+        //     '&trxamt=' . $order_amount
+        // );
         // // header('Location: https://www.baidu.com');
         // exit; // 终止当前脚本的执行，确保页面跳转生效
-        // require_once('../../demo/pay.php');
-        // $response_data = pay();
-        // echo $response_data;
+        require_once('../../demo/pay.php');
+        $response_data = pay($this->encrypt($_SESSION['openid']), $order['order_sn'], $order_amount);
+        echo $response_data;
 
         // 处理dalianpay统一支付接口传回的参数
         // $_SESSION['response_data_json']