优化

app/Modules/Mini/Controllers/AuthController.php

@@ -8,8 +8,8 @@ use App\Exceptions\ClientException;
 use App\Models\User\User;
 use App\Modules\Mini\Services\AuthService;
 use App\Modules\Mini\Services\CaptchaService;
-use App\Modules\Mini\Services\WechatService;
 use App\Modules\Mini\Services\EmailService;
+use App\Modules\Mini\Services\WechatService;
 use Illuminate\Support\Facades\Auth;
 
 class AuthController extends BaseController
@@ -132,10 +132,19 @@ class AuthController extends BaseController
 
     public function resetPassword()
     {
+        $params = $this->valid([
+            "email" => "required|email",
+            "password" => "required|min:6",
+            "captcha" => "required",
+        ]);
+        if (!app(CaptchaService::class)->checkCaptcha($params['email'], $params['captcha'])) {
+            throw new ClientException("验证码错误");
+        }
+        $user = app(AuthService::class)->resetPassword($params);
         return $this->ok([
-            "token" => "token",
-            "name" => "",
-            "phone" => "",
+            "token" => app(AuthService::class)->encryptToken($user->id),
+            "name" => $user->name,
+            "phone" => $user->phone,
         ]);
     }
 }

app/Modules/Mini/Services/AuthService.php

@@ -66,4 +66,13 @@ class AuthService extends BaseService
     {
         return substr($token, 32);
     }
+
+    public function resetPassword($params)
+    {
+        $user = User::where("email", $params['email'])->first();
+        $user->password = $user->hashPassword($params['password']);
+        $user->save();
+
+        return $user;
+    }
 }

app/Modules/Mini/Services/FavService.php

@@ -33,14 +33,17 @@ class FavService extends BaseService
         return [
             "total" => $p->total(),
             "page_total" => $p->lastPage(),
-            "list" => array_map(function (UserFav $model) {
+            "list" => array_values(array_filter(array_map(function (UserFav $model) {
+                if (is_null($model->good)) {
+                    return null;
+                }
                 return [
                     "id" => $model->id,
                     "name" => $model->good->name,
                     "thumb" => $model->good->thumb,
                     "status" => $model->good->status,
                 ];
-            }, $p->items()),
+            }, $p->items()))),
         ];
     }
 }

app/Modules/Mini/Services/GoodsService.php

@@ -14,7 +14,7 @@ class GoodsService extends BaseService
     public function info($params)
     {
         $id = $params['id'];
-        $goods = Goods::where("status", Goods::STATUS_OK)->where("id", $id)->first();
+        $goods = Goods::where("status", Goods::STATUS_OK)->where("id", $id)->firstOrFail();
 
         $goods->view_total++;
         $goods->save();

app/Modules/Mini/Services/OrderService.php

@@ -4,6 +4,7 @@ namespace App\Modules\Mini\Services;
 
 use App\Base\BaseService;
 use App\Events\OrderCreateEvent;
+use App\Exceptions\ClientException;
 use App\Models\Cart;
 use App\Models\Goods\Goods;
 use App\Models\Goods\GoodsSku;
@@ -29,6 +30,9 @@ class OrderService extends BaseService
             $order->save();
 
             $sku = GoodsSku::where("goods_id", $params['id'])->where("id", $params['sku_id'])->first();
+            if (is_null($sku)) {
+                throw new ClientException("sku id:{$params['sku_id']} 没有找到");
+            }
             $og = new OrderGoods();
             $og->order_id = $order->id;
             $og->goods_id = $params['id'];

app/Modules/Pc/Controllers/AuthController.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Modules\Pc\Controllers;
-
-use App\Base\BaseController;
-use App\Base\Validation\Phone;
-use App\Exceptions\ClientException;
-use App\Models\User\User;
-use App\Modules\Mini\Services\AuthService;
-use App\Modules\Mini\Services\CaptchaService;
-use App\Modules\Mini\Services\EmailService;
-use Illuminate\Support\Facades\Auth;
-
-class AuthController extends BaseController
-{
-    public function emailCaptcha()
-    {
-        $params = $this->valid([
-            "email" => "required|email",
-            "source" => "required",
-        ]);
-
-        return $this->ok(app(EmailService::class)->emailCaptcha($params['email'], $params['source']));
-    }
-
-    public function profile()
-    {
-        /** @var User $user */
-        $user = Auth::user();
-        return $this->ok([
-            "id" => $user->id,
-            "token" => app(AuthService::class)->encryptToken($user->id),
-            "name" => $user->name,
-            "avatar" => $user->avatar,
-            "company" => [
-                "id" => optional($user->company)->id ?? 0,
-                "name" => optional($user->company)->name ?? "",
-            ],
-        ]);
-    }
-
-
-    public function resetPassword()
-    {
-        return $this->ok([
-            "token" => "token",
-            "name" => "",
-            "phone" => "",
-        ]);
-    }
-}

routes/pc.php

@@ -1,6 +1,5 @@
 <?php
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 
 Route::get('/', [\App\Http\Controllers\Controller::class, "ping"]);