sku

app/Modules/Admin/Services/OrderService.php

@@ -12,6 +12,7 @@ class OrderService extends BaseService
 {
     public function paginate($params)
     {
+        //TODO kphcdr
         $p = Order::query()->when($params['status'], function (Builder $query) use ($params) {
             return $query->where("status", $params['status']);
         })->when($params['name'], function (Builder $query) use ($params) {

app/Modules/Mini/Controllers/AuthController.php

@@ -44,6 +44,22 @@ class AuthController extends BaseController
             "token" => app(AuthService::class)->encryptToken($user->id),
             "name" => $user->name,
             "phone" => $user->phone,
+            "email" => $user->email,
+        ]);
+    }
+
+    public function updateUserInfo()
+    {
+        $params = $this->valid([
+            "avatar" => "required",
+            "name" => "string",
+        ]);
+        $user = app(AuthService::class)->updateUserInfo(Auth::user(), $params);
+        return $this->ok([
+            "token" => app(AuthService::class)->encryptToken($user->id),
+            "name" => $user->name,
+            "phone" => $user->phone,
+            "email" => $user->email,
         ]);
     }
 
@@ -61,6 +77,7 @@ class AuthController extends BaseController
             "token" => app(AuthService::class)->encryptToken($user->id),
             "name" => $user->name,
             "phone" => $user->phone,
+            "email" => $user->email,
         ]);
     }
 
@@ -113,6 +130,7 @@ class AuthController extends BaseController
             "token" => app(AuthService::class)->encryptToken($user->id),
             "name" => $user->name,
             "phone" => $user->phone,
+            "email" => $user->email,
         ]);
     }
 
@@ -127,6 +145,7 @@ class AuthController extends BaseController
             "token" => app(AuthService::class)->encryptToken($user->id),
             "name" => $user->name,
             "phone" => $user->phone,
+            "email" => $user->email,
         ]);
     }
 
@@ -145,6 +164,7 @@ class AuthController extends BaseController
             "token" => app(AuthService::class)->encryptToken($user->id),
             "name" => $user->name,
             "phone" => $user->phone,
+            "email" => $user->email,
         ]);
     }
 }

app/Modules/Mini/Services/AuthService.php

@@ -5,8 +5,7 @@ namespace App\Modules\Mini\Services;
 use App\Base\BaseService;
 use App\Exceptions\ClientException;
 use App\Models\User\User;
-use EasyWeChat\Kernel\HttpClient\Response;
-use EasyWeChat\MiniApp\Application;
+use Illuminate\Support\Arr;
 
 class AuthService extends BaseService
 {
@@ -75,4 +74,26 @@ class AuthService extends BaseService
 
         return $user;
     }
+
+    public function updateUserInfo(User $user, $params)
+    {
+        if ($params['avatar']) {
+            $user->extra = array_merge($user->extra, [
+                "wechat" => [
+                    "avatar" => $params['avatar'],
+                ],
+            ]);
+        }
+
+        if ($email = Arr::get($params, "email")) {
+            $user->email = $email;
+        }
+        if ($name = Arr::get($params, "name")) {
+            $user->name = $name;
+        }
+
+        $user->save();
+
+        return $user;
+    }
 }

routes/mini.php

@@ -7,11 +7,13 @@ Route::get('/', [\App\Http\Controllers\Controller::class, "ping"]);
 
 Route::post("/auth/codeToSession", [\App\Modules\Mini\Controllers\AuthController::class, "codeToSession"]);
 Route::get("/auth/test", [\App\Modules\Mini\Controllers\AuthController::class, "test"]);
+Route::post("/auth/emailCaptcha", [\App\Modules\Mini\Controllers\AuthController::class, "emailCaptcha"]);
+
 Route::middleware([\App\Http\Middleware\CheckAuthMiddleware::class])->group(function () {
     Route::post("/auth/decryptUserInfo", [\App\Modules\Mini\Controllers\AuthController::class, "decryptUserInfo"]);
     Route::post("/auth/decryptPhone", [\App\Modules\Mini\Controllers\AuthController::class, "decryptPhone"]);
     Route::get("/auth/profile", [\App\Modules\Mini\Controllers\AuthController::class, "profile"]);
-
+    Route::post('/auth/updateUserInfo', [\App\Modules\Mini\Controllers\AuthController::class, "updateUserInfo"]);
     Route::post("/goods/fav", [\App\Modules\Mini\Controllers\GoodsController::class, "fav"]);
     Route::post("/goods/ask", [\App\Modules\Mini\Controllers\GoodsController::class, "ask"]);
     Route::post("/goods/cart", [\App\Modules\Mini\Controllers\GoodsController::class, "cart"]);