From a9c446089b547b35c48188b536dd0e45796a2ae8 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 14 Sep 2022 16:00:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=9B=E5=BB=BA=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Order.php  | 26 ++++++++++++++++++--------
 app/controller/Wechat.php | 18 ++++++++++++------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/app/controller/Order.php b/app/controller/Order.php
index 4699237..0956b24 100644
--- a/app/controller/Order.php
+++ b/app/controller/Order.php
@@ -3,6 +3,7 @@
 namespace app\controller;
 
 use app\model\Student;
+use think\facade\Route;
 use think\response\Json;
 
 class Order
@@ -18,18 +19,18 @@ class Order
     {
         $userid = $GLOBALS['data']['userid'];
         $amount = env("PAY_AMOUNT") ?? 15;
-        if(env("APP_DEBUG")){
+        if (env("APP_DEBUG")) {
             $amount = 0.01;
         }
-        if(empty($GLOBALS['data']['data']['student_id'])){
-            return show("请正确上传用户信息!", ERROR_CODE,[]);
+        if (empty($GLOBALS['data']['data']['student_id'])) {
+            return show("请正确上传用户信息!", ERROR_CODE, []);
         }
         $student_id = $GLOBALS['data']['data']['student_id'];
-        if(!Student::findOrEmpty($student_id)){
-            return show("用户信息不存在!", ERROR_CODE,[]);
+        if (! Student::findOrEmpty($student_id)) {
+            return show("用户信息不存在!", ERROR_CODE, []);
         }
-        if(\app\model\Order::where(["user_id"=>$userid,"student_id"=>$student_id,"status"=>1])->find()){
-            return show("已经为该孩子助力过了!", ERROR_CODE,[]);
+        if (\app\model\Order::where(["user_id" => $userid, "student_id" => $student_id, "status" => 1])->find()) {
+            return show("已经为该孩子助力过了!", ERROR_CODE, []);
         }
         $order = \app\model\Order::create([
             'student_id' => $student_id,
@@ -38,6 +39,15 @@ class Order
             'status'     => 0,
         ]);
 
-        return show("订单创建成功！", SUCCESS_CODE, $order->id);
+        return show("订单创建成功！", SUCCESS_CODE, [
+            'payment_url' => $notifyUrl = Route::buildUrl('wechat/payment')
+                ->vars([
+                    'order_id' => $order->id,
+                    'token'    => '这里要直接获取当前用户的TOKEN传过去',
+                ])
+                ->suffix(false)
+                ->domain(true)
+                ->build()
+        ]);
     }
 }
\ No newline at end of file
diff --git a/app/controller/Wechat.php b/app/controller/Wechat.php
index c88d3ff..4f38ca4 100644
--- a/app/controller/Wechat.php
+++ b/app/controller/Wechat.php
@@ -94,9 +94,15 @@ class Wechat
 
         $order = \app\model\Order::find($orderId);
 
-        if(empty($order)) exit('订单信息不存在');
+        if (empty($order)) {
+            exit('订单信息不存在');
+        }
 
-        if(\app\model\Order::where(["user_id"=>$order['userid'],"student_id"=>$order['student_id'],"status"=>1])->find()){
+        if (\app\model\Order::where([
+            "user_id"    => $order['user_id'],
+            "student_id" => $order['student_id'],
+            "status"     => 1,
+        ])->find()) {
             exit('已经为该孩子助力过了');
         }
 
@@ -147,12 +153,12 @@ class Wechat
                 $order->paid();
 
                 //订单支付成功。查询用户信息
-                $order_detail = \app\model\Order::where("id",$order->order_id)->find();
+                $order_detail = \app\model\Order::where("id", $order->order_id)->find();
 
                 //为用户增加助力值
-                $zhuLi = env("ZHULI_VALUE")??150;
-                Db::name("student")->inc("hot",$zhuLi)->where("id",$order_detail->id)->update();
-                Db::name("student")->inc("hot_count",1)->where("id",$order_detail->id)->update();
+                $zhuLi = env("ZHULI_VALUE") ?? 150;
+                Db::name("student")->inc("hot", $zhuLi)->where("id", $order_detail->id)->update();
+                Db::name("student")->inc("hot_count", 1)->where("id", $order_detail->id)->update();
 
             } else {
                 $fail('Order not exists.');