From 98927bf9aa79701b6a4468b1d43ccd96e9de1b58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?= <邮箱>
Date: Tue, 1 Aug 2023 09:41:47 +0800
Subject: [PATCH] update

---
 .gitignore                                         |   4 -
 mobile/plugins/payment/wxpay.php                   | 182 ++++++++++-----------
 .../apps/flow/controllers/IndexController.php      |   1 -
 3 files changed, 91 insertions(+), 96 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4a2c1e9..89ceaae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
-config.php
 data/config.php
 mobile/data/config.php
-phpMyAdmin4.8.5
-DL_Pay_Demo
-a_test
diff --git a/mobile/plugins/payment/wxpay.php b/mobile/plugins/payment/wxpay.php
index 9e8d9ec..155ab46 100755
--- a/mobile/plugins/payment/wxpay.php
+++ b/mobile/plugins/payment/wxpay.php
@@ -12,97 +12,97 @@ class wxpay
      */
     public function pay()
     {
-    // 统一支付接口Demo
-
-	// 加载基础类
-	require_once('./library/Base.php');
-	$Base = new Base();
-
-	// 获取配置信息
-	$config = $Base->getConfig();
-	// var_dump('<pre>', $config);
-
-	// 接口URL（测试）
-	$api_url = $config['pay_url'];
-
-	// 加个body字段传中文试试
-
-	// 组装交易报文
-	$reqsn_prefix = date('Ymd');
-	// var_dump("uniq_id(reqsn)");
-	// echo "\r\n";
-	// var_dump(uniqid($reqsn_prefix));
-	$trade_data = array(
-        'orgid' => $config['org_num'],
-        'cusid' => $config['cusid'],
-        'branchno' => $config['branchno'],
-        'termcode' => $config['termcode'],
-        'version' => $config['version'],
-        'trxamt' => '1',
-        'reqsn' => uniqid($reqsn_prefix),
-        'producp' => 'JX0002',
-        'transtype' => 'JSP511',
-        'paytype' => 'W01',
-        'randomstr' => md5( uniqid() ),
-        'body' => 'pages',
-        "acct" => $this->parameters["openid"] # 不知道好不好用...
-    );
-
-    	// 生成签名
-	$sign = $Base->Crypt->makeSign($trade_data);
-	if($sign === false)
-	{
-		// echo $Base->Crypt->err_msg;
-		die();
-	}
-	// echo "\r\n";
-	// echo "[sign]: {$sign}";
-	// die();
-
-	// 加密交易报文
-	$crypted_trade_data = $Base->Crypt->encryptTradeData($trade_data);
-	if($crypted_trade_data === false)
-	{
-		// echo $Base->Crypt->err_msg;
-		die();
-	}
-	// echo "\r\n";
-	// echo "[crypted message]: {$crypted_trade_data}";
-	// die();
-
-	// 发送报文
-	// echo "\r\n";
-	// var_dump($api_url);
-	$response = $Base->Request->send($api_url, $crypted_trade_data, $sign);
-	if($response === false)
-	{
-		// echo $Base->Request->err_msg;
-		die();
-	}
-
-	// echo "\r\n";
-	// echo "[response message]: {$response}";
-
-	// 解析响应报文
-	$response = json_decode($response, true);
-	$response_data_crypted = $response['data'];
-	$response_sign = $response['sign'];
-	// echo "\r\n";
-	// echo "[response sign]: {$response_sign}";
-	// echo "\r\n";
-	// echo "[response data (ciphertext)]: {$response_data_crypted}";
-
-	// 解密响应密文
-	$response_data = $Base->Crypt->decryptTradeData($response_data_crypted);
-	if($response_data === false)
-	{
-		// echo $Base->Crypt->err_msg;
-		die();
-	}
-	// echo "\r\n";
-	// echo "[response data(clear text)]: {$response_data}";
-	echo $response_data;
-	// die();
+        // 统一支付接口Demo
+
+        // 加载基础类
+        require_once('./library/Base.php');
+        $Base = new Base();
+
+        // 获取配置信息
+        $config = $Base->getConfig();
+        // var_dump('<pre>', $config);
+
+        // 接口URL（测试）
+        $api_url = $config['pay_url'];
+
+        // 加个body字段传中文试试
+
+        // 组装交易报文
+        $reqsn_prefix = date('Ymd');
+        // var_dump("uniq_id(reqsn)");
+        // echo "\r\n";
+        // var_dump(uniqid($reqsn_prefix));
+        $trade_data = array(
+            'orgid' => $config['org_num'],
+            'cusid' => $config['cusid'],
+            'branchno' => $config['branchno'],
+            'termcode' => $config['termcode'],
+            'version' => $config['version'],
+            'trxamt' => '1',
+            'reqsn' => uniqid($reqsn_prefix),
+            'producp' => 'JX0002',
+            'transtype' => 'JSP511',
+            'paytype' => 'W01',
+            'randomstr' => md5( uniqid() ),
+            'body' => 'pages',
+            "acct" => $this->parameters["openid"] # 不知道好不好用...
+        );
+
+            // 生成签名
+        $sign = $Base->Crypt->makeSign($trade_data);
+        if($sign === false)
+        {
+            // echo $Base->Crypt->err_msg;
+            die();
+        }
+        // echo "\r\n";
+        // echo "[sign]: {$sign}";
+        // die();
+
+        // 加密交易报文
+        $crypted_trade_data = $Base->Crypt->encryptTradeData($trade_data);
+        if($crypted_trade_data === false)
+        {
+            // echo $Base->Crypt->err_msg;
+            die();
+        }
+        // echo "\r\n";
+        // echo "[crypted message]: {$crypted_trade_data}";
+        // die();
+
+        // 发送报文
+        // echo "\r\n";
+        // var_dump($api_url);
+        $response = $Base->Request->send($api_url, $crypted_trade_data, $sign);
+        if($response === false)
+        {
+            // echo $Base->Request->err_msg;
+            die();
+        }
+
+        // echo "\r\n";
+        // echo "[response message]: {$response}";
+
+        // 解析响应报文
+        $response = json_decode($response, true);
+        $response_data_crypted = $response['data'];
+        $response_sign = $response['sign'];
+        // echo "\r\n";
+        // echo "[response sign]: {$response_sign}";
+        // echo "\r\n";
+        // echo "[response data (ciphertext)]: {$response_data_crypted}";
+
+        // 解密响应密文
+        $response_data = $Base->Crypt->decryptTradeData($response_data_crypted);
+        if($response_data === false)
+        {
+            // echo $Base->Crypt->err_msg;
+            die();
+        }
+        // echo "\r\n";
+        // echo "[response data(clear text)]: {$response_data}";
+        echo $response_data;
+        // die();
     }
 
     /**
diff --git a/mobile/source/apps/flow/controllers/IndexController.php b/mobile/source/apps/flow/controllers/IndexController.php
index ecb7d81..3eacedc 100755
--- a/mobile/source/apps/flow/controllers/IndexController.php
+++ b/mobile/source/apps/flow/controllers/IndexController.php
@@ -611,7 +611,6 @@ class IndexController extends FrontendController {
             $shipping['shipping_id'] = 0;
         }
         $shipping_type = 0; // sc_test
-        // $shipping['shipping_id'] = 1; // sc_test
         $shipping['shipping_id'] = 1; // sc_test
         $order = array(
             'shipping_id'     => $shipping['shipping_id'],