From 0ea0e1140c0c50bc7e14b1b66aa4e1a7e9d8e924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?= <邮箱>
Date: Wed, 2 Aug 2023 13:41:18 +0800
Subject: [PATCH] test

---
 mobile/dalianpay/demo/pay.php                           | 7 ++++---
 mobile/plugins/payment/wxpay.php                        | 2 +-
 mobile/source/apps/flow/controllers/IndexController.php | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mobile/dalianpay/demo/pay.php b/mobile/dalianpay/demo/pay.php
index b5188f5..5e06c9a 100644
--- a/mobile/dalianpay/demo/pay.php
+++ b/mobile/dalianpay/demo/pay.php
@@ -2,8 +2,9 @@
 	// function pay()
 	// {
 		session_start();
-		$openid = $_SESSION['openid'];
-		// var_dump($openid);
+		// $openid = $_SESSION['openid'];
+		$openid = $_GET['openid'];
+		var_dump($openid);
 		$redirect_url = $_SESSION['prev_url'];
 		// unset($_SESSION['prev_url']);
 		// var_dump($redirect_url);
@@ -43,7 +44,7 @@
 			'paytype' => 'W02',  // 微信js支付
 			'randomstr' => md5( uniqid() ),
 			// 'body' => 'pages',
-			// 'acct' => $openid,
+			'acct' => $openid,
 			// 'notify_url' => '', // 交易结果通知地址
 			// 'sub_appid' => 'wx79343915f99167e6',
 			// 'front_url' => '', // 支付完成跳转
diff --git a/mobile/plugins/payment/wxpay.php b/mobile/plugins/payment/wxpay.php
index 3199cfd..fe2ecad 100755
--- a/mobile/plugins/payment/wxpay.php
+++ b/mobile/plugins/payment/wxpay.php
@@ -203,7 +203,7 @@ class wxpay
         var_dump($url);
         $_SESSION['prev_url'] = $url;
         var_dump($_SESSION['prev_url']);
-        header('Location: https://shop.heavenk.com/mobile/dalianpay/demo/pay.php');
+        header('Location: https://shop.heavenk.com/mobile/dalianpay/demo/pay.php?openid=$_SESSION[openid]');
         // // header('Location: https://www.baidu.com');
         // exit; // 终止当前脚本的执行，确保页面跳转生效
         // require_once('../../demo/pay.php');
diff --git a/mobile/source/apps/flow/controllers/IndexController.php b/mobile/source/apps/flow/controllers/IndexController.php
index 3eacedc..cb3f6b3 100755
--- a/mobile/source/apps/flow/controllers/IndexController.php
+++ b/mobile/source/apps/flow/controllers/IndexController.php
@@ -721,6 +721,7 @@ class IndexController extends FrontendController {
         }
 
         /* 检查商品总额是否达到最低限购金额 */
+        
         if ($flow_type == CART_GENERAL_GOODS && cart_amount(true, CART_GENERAL_GOODS) < C('shop.min_goods_amount'))
         {
             show_message(sprintf(L('goods_amount_not_enough'), price_format(C('shop.min_goods_amount'), false)));