1557492053 преди 1 година
родител
ревизия
4339d2e1f4
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 1 1
      application/api/controller/Order.php
  2. 2 2
      application/api/service/OrderService.php

+ 1 - 1
application/api/controller/Order.php

@@ -201,7 +201,7 @@ class Order extends Api
         if (!in_array($params['platform'], ["web", "applet", "app"]))
             $this->error("平台错误!");
         $r = $this->service->payment($this->user->id, $params['order_id'], $params['payment_type'], $params["platform"], $params["description"]);
-        $r->code() == 1 ? $this->success($r->data()) : $this->error($r->msg(), null, $r->code());
+        $r->code() ? $this->success($r->data()) : $this->error($r->msg(), null, $r->code());
     }
 
     /**

+ 2 - 2
application/api/service/OrderService.php

@@ -644,7 +644,7 @@ class OrderService extends BaseService
             if ($platform == "applet")
                 $openid = $user["applet_openid"];
             if ($payment_type === \E_ORDER_PAY_TYPE::Wechat) {
-                if (is_null($openid) || mb_strlen($openid) === 0)
+                if ($platform != "app" && (is_null($openid) || mb_strlen($openid) === 0))
                     return $this->fail("请先绑定微信再进行支付", 101);
             }
             $start_time = strtotime($order->service_start_date);
@@ -688,7 +688,7 @@ class OrderService extends BaseService
                 default:
                     $res = $this->walletService->payBalance($order);
             }
-           (new CallbackService())->payOrderSuccess($order["no"]);
+            (new CallbackService())->payOrderSuccess($order["no"]);
             return $res;
         } catch (Exception $e) {
             return $this->fail($e->getMessage());