From 641be4f7826a90f8ebea66e9f76ae91f373141c1 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Wed, 9 Jun 2021 10:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F=E5=B8=90?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=88=9B=E5=BB=BA=E5=92=8C=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/controllers/game_user.controller.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/api/controllers/game_user.controller.ts b/src/api/controllers/game_user.controller.ts
index e7edcdc..011544d 100644
--- a/src/api/controllers/game_user.controller.ts
+++ b/src/api/controllers/game_user.controller.ts
@@ -23,17 +23,16 @@ class GameUserController extends BaseController {
     if (!accountId) {
       throw new ZError(11, 'accountId needed')
     }
-    let user = (await GameUser.findOrCreate({ accountId })).doc
-    user.updateFromReq(req.params)
     let sid = req.params.shop
     if (sid) {
       const shop = await Shop.fetchByID(sid)
-      if (shop) {
-        user.shop = shop.id
-        user.shops.pushOnce(shop.id)
-      }
+      req.params.shop = shop.id
+    }
+    let user = await GameUser.findOneAndUpdate({ accountId }, req.params, { upsert: true, new: true })
+    if (sid) {
+      user.shops.pushOnce(req.params.shop)
+      await user.save()
     }
-    await user.save()
     const token = await res.jwtSign({ id: user.id, accountId })
     return { token }
   }