refactor: 💡 login

v2.0/dist/index.d.ts

@@ -27,12 +27,12 @@ declare const _default: {
         list: IAwards[];
     }>>;
     receiveObjectPrize: (context: IContext<import("./controller/awards.controller").IReceiveOjectParams>, { activityInfo }: import("./controller/awards.controller").IReceivePrizeControllerInfos, [awardSer]: [import("./service").AwardsService]) => Promise<IResult<boolean>>;
-    receiveEnamePrize: (context: IContext<import("./controller/awards.controller").IReceiveEnameParams>, { awardInfo, session }: import("./controller/awards.controller").IReceivePrizeControllerInfos, [awardSer]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<IAwards | import("taobao-mini-sdk/lib/utils/codetypes").CodeType, true>>;
+    receiveEnamePrize: (context: IContext<import("./controller/awards.controller").IReceiveEnameParams>, { awardInfo, session }: import("./controller/awards.controller").IReceivePrizeControllerInfos, [awardSer]: [import("./service").AwardsService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | number[] | object[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<import("taobao-mini-sdk/lib/utils/codetypes").CodeType | IAwards, true>>;
     doHelp: (context: IContext<{
         activityId: string;
         inviteId: string;
     }>, { userInfo, activityInfo, inviteUserInfo }: import("./controller/share.controller").IdoHelpInfos, [taskService, statService]: [import("./service").TaskService, import("./service").StatService]) => Promise<IResult<boolean>>;
-    getStats: (context: IContext<import("./controller/stat.controller").IGetStatsParams>) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | object[] | number[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<any, true>>;
+    getStats: (context: IContext<import("./controller/stat.controller").IGetStatsParams>) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<string | boolean | object | string[] | number[] | object[], false> | import("taobao-mini-sdk/lib/utils/resultmodel").Result<any, true>>;
     addStat: (context: IContext<import("./controller/stat.controller").IAddStatsParams>, { userInfo }: IControllerInfos, [statService]: [import("./service").StatService]) => Promise<import("taobao-mini-sdk/lib/utils/resultmodel").Result<boolean, true>>;
     getRankList: (context: IContext<{
         activityId: string;

v2.0/dist/service/user.service.d.ts

@@ -19,6 +19,7 @@ declare class UserService extends BaseService {
      * @returns 若用户不存在，返回null; 用户存在，返回用户信息(object对象)
      */
     getUserInfoByOpenId(openId: string): Promise<IUserInfo>;
+    doLogin(userInfo: IUserInfo, vipInfo: IVipInfo, activityInfo: IActivityInfo): Promise<IUserInfo>;
     /**
      * 初始化用户数据
      *

v2.0/dist/service/user.service.js

@@ -120,6 +120,25 @@ var UserService = /** @class */ (function (_super) {
             });
         });
     };
+    UserService.prototype.doLogin = function (userInfo, vipInfo, activityInfo) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!!userInfo) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.initUserData(vipInfo, activityInfo)];
+                    case 1:
+                        userInfo = _a.sent();
+                        return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, this.updateUserData(vipInfo, userInfo, activityInfo)];
+                    case 3:
+                        userInfo = _a.sent();
+                        _a.label = 4;
+                    case 4: return [2 /*return*/, userInfo];
+                }
+            });
+        });
+    };
     /**
      * 初始化用户数据
      *
@@ -130,17 +149,17 @@ var UserService = /** @class */ (function (_super) {
      */
     UserService.prototype.initUserData = function (vipInfo, activityInfo) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, openId, data, activityId, isFollow, avatar, inviteId, userNick, today, tasks, follow, member, user;
-            var _b, _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var _a, openId, data, activityId, isFollow, avatar, inviteId, userNick, today, tasks, _b, follow, _c, member, user;
+            var _d, _e;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         _a = this.context, openId = _a.openId, data = _a.data;
                         activityId = data.activityId, isFollow = data.isFollow, avatar = data.avatar, inviteId = data.inviteId, userNick = data.userNick;
                         today = utils_1.getToday();
                         console.log("----------" + today + "----------", today);
                         tasks = activityInfo.tasks;
-                        follow = tasks.follow, member = tasks.member;
+                        _b = tasks.follow, follow = _b === void 0 ? {} : _b, _c = tasks.member, member = _c === void 0 ? {} : _c;
                         user = {
                             activityId: activityId,
                             avatar: avatar,
@@ -158,12 +177,12 @@ var UserService = /** @class */ (function (_super) {
                             follow: {
                                 flag: !!isFollow
                             },
-                            login: (_b = {},
-                                _b[today] = 1,
-                                _b),
-                            taskInfo: (_c = {},
-                                _c[today] = {},
-                                _c),
+                            login: (_d = {},
+                                _d[today] = 1,
+                                _d),
+                            taskInfo: (_e = {},
+                                _e[today] = {},
+                                _e),
                             createTime: Date.now(),
                             createDay: today,
                             updateTime: Date.now()
@@ -178,7 +197,7 @@ var UserService = /** @class */ (function (_super) {
                         }
                         return [4 /*yield*/, this.userdao.insertOne(user)];
                     case 1:
-                        _d.sent();
+                        _f.sent();
                         return [2 /*return*/, user];
                 }
             });

v2.0/dist/service/user.service.js.map

-{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

v2.0/src/controller/login.controller.ts

@@ -28,14 +28,9 @@ export default class User {
   ): Promise<IResult<{ openId: string }>> {
     const { openId } = context
 
-    if (!userInfo) {
-      userInfo = await userService.initUserData(vipInfo, activityInfo)
-    } else {
-      userInfo = await userService.updateUserData(vipInfo, userInfo, activityInfo)
-    }
-
+    const updatedUserInfo = await userService.doLogin(userInfo, vipInfo, activityInfo)
     // access表
-    await accessService.addAccess(userInfo)
+    await accessService.addAccess(updatedUserInfo)
 
     return resultsModel.success({
       openId

v2.0/src/service/user.service.ts

@@ -11,6 +11,7 @@ import { getToday, formatUpdateUserProjection } from '../utils'
 import { isNewVip } from '../utils/common/userUpdate'
 import { formatUserNick } from '../utils/common/format'
 import { getShopVip, formatVipCbUrl } from '../utils/common/vip'
+import { userInfo } from 'os'
 class UserService extends BaseService {
   userdao: IBaseDao
   constructor(context: IContext<IParams>) {
@@ -40,6 +41,15 @@ class UserService extends BaseService {
     return record
   }
 
+  async doLogin(userInfo: IUserInfo, vipInfo: IVipInfo, activityInfo: IActivityInfo) {
+    if (!userInfo) {
+      userInfo = await this.initUserData(vipInfo, activityInfo)
+    } else {
+      userInfo = await this.updateUserData(vipInfo, userInfo, activityInfo)
+    }
+    return userInfo
+  }
+
   /**
    * 初始化用户数据
    *
@@ -54,7 +64,7 @@ class UserService extends BaseService {
     const today = getToday()
     console.log(`----------${today}----------`, today)
     const { tasks } = activityInfo
-    const { follow, member } = tasks
+    const { follow = {} as ITaskConfig, member = {} as ITaskConfig } = tasks
     const user: IUserInfo = {
       activityId,
       avatar,