zilong преди 4 години
родител
ревизия
5738d4c5b7
променени са 2 файла, в които са добавени 8 реда и са изтрити 3 реда
  1. 4 2
      app/Http/Controllers/Api/V1/OrderController.php
  2. 4 1
      app/Http/Controllers/Api/V1/PayCallbackController.php

+ 4 - 2
app/Http/Controllers/Api/V1/OrderController.php

xqd xqd
@@ -192,7 +192,8 @@ class OrderController extends AuthController
         $order_status = $payment_status = 1;
         $payment_time = 0;
         if ($payment_amount == 0 || $req['payment_type'] == 2) {
-            $order_status = $payment_status = 2;
+            $order_status = 3;
+            $payment_status = 2;
             $payment_time = time();
         }
 
@@ -325,7 +326,8 @@ class OrderController extends AuthController
         $order_status = $payment_status = 1;
         $payment_time = 0;
         if ($payment_amount == 0 || $req['payment_type'] == 2) {
-            $order_status = $payment_status = 2;
+            $order_status = 3;
+            $payment_status = 2;
             $payment_time = time();
         }
 

+ 4 - 1
app/Http/Controllers/Api/V1/PayCallbackController.php

xqd
@@ -47,8 +47,11 @@ class PayCallbackController extends Controller
                         Payment::where('id', $payment['id'])->update(['online_sn' => $message['transaction_id'], 'status' => 2, 'payment_time' => time()]);
                         $order = Order::select(['id', 'user_id', 'docter_id', 'product_type', 'payment_amount'])->where('id', $payment['order_id'])->first();
                         $order_status = 2;
-                        if ($order['product_type'] == 7) {
+                        if (in_array($order['product_type'], [3,4,5,6])) {
                             $order_status = 3;
+                        }
+                        elseif ($order['product_type'] == 7) {
+                            $order_status = 4;
                             //改变用户余额
                             User::changeBalance($order['user_id'], $order['payment_amount'], 2, $order['id'], '充值');
                         }