From ad89890c2ab1c4e2e0fb3057b6a2c912f246d3bb Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Fri, 9 Sep 2022 16:55:16 +0800
Subject: [PATCH] update

---
 app/controller/Wechat.php | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/controller/Wechat.php b/app/controller/Wechat.php
index e583cd3..a0eb507 100644
--- a/app/controller/Wechat.php
+++ b/app/controller/Wechat.php
@@ -80,19 +80,31 @@ class Wechat
      */
     public function payment()
     {
-        $userId = $GLOBALS['data']['userid'];
-        if (empty($userId)) {
-            return show("未登录！", NEED_LOGIN);
+        $clientToken = Request::get('token');
+        $orderId     = Request::get('order_id');
+        if ($clientToken) {
+            $tk     = json_decode(authcode($clientToken), true);
+            $userId = $tk['userid'];
+        }
+        $user = AppUser::findOrEmpty($userId);
+        if (! $user) {
+            exit('NO USER');
         }
 
-        $user = AppUser::find($userId);
+        $order = \app\model\Order::find($orderId);
+
 
         $notifyUrl = Route::buildUrl('wechat/paid')
             ->suffix(false)
             ->domain(true);
-        $config    = Config::get('wechat.payment');
-        $payment   = Factory::payment($config);
-        $unify     = $payment->order->unify([
+
+        dump($notifyUrl);
+
+        dd($order);
+
+        $config  = Config::get('wechat.payment');
+        $payment = Factory::payment($config);
+        $unify   = $payment->order->unify([
             'body'         => '商品订单',
             'out_trade_no' => time(),
             'total_fee'    => 100,