zilong %!s(int64=4) %!d(string=hai) anos
pai
achega
0e7c33938b
Modificáronse 2 ficheiros con 36 adicións e 28 borrados
  1. 31 27
      app/Helpers/functions.php
  2. 5 1
      app/Http/Controllers/Api/V1/UserController.php

+ 31 - 27
app/Helpers/functions.php

xqd
@@ -148,36 +148,40 @@ if (!function_exists('build_sn')) {
 if (!function_exists('birthday_to_age')) {
     function birthday_to_age($birthday)
     {
-        $date2 = date('Y-m-d');
-        list($y1, $m1, $d1) = explode('-', $birthday);
-        list($y2, $m2, $d2) = explode('-', $date2);
-        $y = $y2 - $y1;
-        $m = $m2 - $m1;
-        $d = $d2 - $d1;
-        if ($d < 0) {
-            $d += (int)date('t', strtotime("-1 month $date2"));
-            $m = $m - 1;
-        }
-        if ($m < 0) {
-            $m += 12;
-            $y = $y - 1;
-        }
+        if (!empty($birthday)) {
+            $date2 = date('Y-m-d');
+            list($y1, $m1, $d1) = explode('-', $birthday);
+            list($y2, $m2, $d2) = explode('-', $date2);
+            $y = $y2 - $y1;
+            $m = $m2 - $m1;
+            $d = $d2 - $d1;
+            if ($d < 0) {
+                $d += (int)date('t', strtotime("-1 month $date2"));
+                $m = $m - 1;
+            }
+            if ($m < 0) {
+                $m += 12;
+                $y = $y - 1;
+            }
+
+            if ($y == 0 && $m == 0 && $d != 0) {
+                return $d . '天';
+            } elseif ($y == 0 && $m != 0 && $d != 0) {
+                return $m . '个月' . $d . '天';
+            } elseif ($y != 0 && $m == 0 && $d != 0) {
+                return $y . '岁' . $d . '天';
+            } elseif ($y != 0 && $m == 0 && $d == 0) {
+                return $y . '岁';
+            } elseif ($y == 0 && $m != 0 && $d == 0) {
+                return $m . '个月';
+            } elseif ($y != 0 && $m != 0 && $d == 0) {
+                return $y . '岁' . $m . '个月';
+            }
 
-        if ($y == 0 && $m == 0 && $d != 0) {
-            return $d . '天';
-        } elseif ($y == 0 && $m != 0 && $d != 0) {
-            return $m . '个月' . $d . '天';
-        } elseif ($y != 0 && $m == 0 && $d != 0) {
-            return $y . '岁' . $d . '天';
-        } elseif ($y != 0 && $m == 0 && $d == 0) {
-            return $y . '岁';
-        } elseif ($y == 0 && $m != 0 && $d == 0) {
-            return $m . '个月';
-        } elseif ($y != 0 && $m != 0 && $d == 0) {
-            return $y . '岁' . $m . '个月';
+            return $y . '岁' . $m . '个月' . $d . '天';
         }
 
-        return $y . '岁' . $m . '个月' . $d . '天';
+        return '';
     }
 }
 

+ 5 - 1
app/Http/Controllers/Api/V1/UserController.php

xqd xqd xqd
@@ -9,12 +9,14 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Models\Order;
+use App\Models\OrderPack;
 use App\Models\User;
 use App\Models\UserBalanceLog;
 use App\Models\UserCoupon;
 use App\Models\UserMessage;
 use EasyWeChat\Factory;
 use Cache;
+use Exception;
 
 class UserController extends AuthController
 {
@@ -43,7 +45,7 @@ class UserController extends AuthController
 
         try {
             $decryptedData = $app->encryptor->decryptData($user['session_key'], $req['iv'], $req['encryptData']);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return out(null, 10001, '获取手机号失败', $e->getMessage());
         }
 
@@ -79,6 +81,8 @@ class UserController extends AuthController
     {
         $user = $this->user;
 
+        $teamIds = OrderPack::where('user_id', $user['id'])->where('end_time', '>', time())->pluck('team_id')->toArray();
+
         $docter_ids = Order::where('user_id', $user['id'])->whereIn('order_status', [2, 3])->where('docter_id', '>', 0)->pluck('docter_id')->toArray();
         $docter_ids = array_values(array_unique($docter_ids));