邹景立 4 gadi atpakaļ
vecāks
revīzija
436c24e429

+ 4 - 2
app/data/service/UserAdminService.php

@@ -85,10 +85,12 @@ class UserAdminService extends Service
      */
     public function get(int $uuid, ?string $type = null): array
     {
-        $user = $this->app->db->name('DataUser')->where(['id' => $uuid, 'deleted' => 0])->findOrEmpty();
+        $map = ['id' => $uuid, 'deleted' => 0];
+        $user = $this->app->db->name('DataUser')->where($map)->find();
         if (empty($user)) throw new Exception('指定UID用户不存在');
         if (!is_null($type)) {
-            $data = $this->app->db->name('DataUserToken')->where(['uid' => $uuid, 'type' => $type])->findOrEmpty();
+            $map = ['uid' => $uuid, 'type' => $type];
+            $data = $this->app->db->name('DataUserToken')->where($map)->find();
             if (empty($data)) {
                 [$state, $info, $data] = UserTokenService::instance()->token($uuid, $type);
                 if (empty($state) || empty($data)) throw new Exception($info);

+ 1 - 0
app/data/service/payment/BalancePyamentService.php

@@ -61,6 +61,7 @@ class BalancePyamentService extends PaymentService
         try {
             // 扣减用户余额
             $this->app->db->transaction(function () use ($order, $paymentAmount) {
+                // 更新订单余额
                 $this->app->db->name('ShopOrder')->where(['order_no' => $order['order_no']])->update([
                     'payment_balance' => $paymentAmount,
                 ]);

+ 1 - 1
app/data/service/payment/EmptyPaymentService.php

@@ -60,6 +60,6 @@ class EmptyPaymentService extends PaymentService
         $this->createPaymentAction($orderNo, $paymentTitle, $paymentAmount);
         // 更新支付行为
         $this->updatePaymentAction($orderNo, CodeExtend::uniqidDate(20), $paymentAmount, '无需支付');
-        return ['code' => 1, 'info' => '无需支付'];
+        return ['code' => 1, 'info' => '订单无需支付'];
     }
 }

+ 1 - 1
app/data/service/payment/JoinpayPaymentService.php

@@ -102,7 +102,7 @@ class JoinpayPaymentService extends PaymentService
      * @param array $data
      * @return array
      */
-    private function _doReuest($data = []): array
+    private function _doReuest(array $data = []): array
     {
         $data['hmac'] = $this->_doSign($data);
         return json_decode(HttpExtend::post($this->uri, $data), true);