入会升级

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

@@ -8,7 +8,7 @@ export default class LoginController {
   /**
    *  登录接口, 初始化/更新用户信息
    */
-  @checkParams(['activityId', 'userNick', 'avatar', 'isFollow'])
+  @checkParams(['activityId', 'userNick', 'avatar', 'isFollow', 'isVip'])
   @noCheckUser
   @registeInfos(['vipInfo'])
   @services([CommonUserService, CommonAccessService])

v2.0/src/controller/common/share.controller.ts

@@ -28,7 +28,7 @@ export default class ShareController {
   /**
    *  完成分享
    */
-  @checkParams(['activityId', 'inviteId'])
+  @checkParams(['activityId', 'inviteId', 'isVip'])
   @registeInfos(['vipInfo'])
   @services([CommonTaskService, CommonStatService])
   @preCheck([checkActivityTime, checkInviteId, checkNewVip, checkHelpRecord])

v2.0/src/controller/common/task.controller.ts

@@ -15,7 +15,7 @@ export default class TaskController {
   /**
    *  任务列表
    */
-  @checkParams(['activityId'])
+  @checkParams(['activityId', 'isVip'])
   @registeInfos(['vipInfo', 'task'])
   @services([CommonGrowtaskService])
   @preCheck([checkActivityTime])

v2.0/src/controller/common/user.controller.ts

@@ -8,19 +8,19 @@ export default class UserController {
   /**
    *  获取会员信息
    */
-  @checkParams(['activityId'])
-  @services([CommonUserService])
-  async getVipInfo(
-    context: IContext<IParams>,
-    { activityInfo, userInfo }: IControllerInfos,
-    [commonUserService]: [CommonUserService]
-  ) {
-    const commonUserGetShopVipResult1 = await commonUserService.getShopVip(context, activityInfo)
-    return resultsModel.success({
-      ...commonUserGetShopVipResult1
-    })
-  }
-  /**
+   @checkParams(['activityId', 'isVip'])
+   @services([CommonUserService])
+   async getVipInfo(
+     context: IContext<IParams>,
+     { activityInfo, userInfo }: IControllerInfos,
+     [commonUserService]: [CommonUserService]
+   ) {
+     const commonUserGetShopVipResult1 = await commonUserService.getShopVip(context, activityInfo)
+     return resultsModel.success({
+       ...commonUserGetShopVipResult1
+     })
+   }
+   /**
    *  获取排行榜
    */
   @checkParams(['activityId', 'key', 'timeKey', 'limit'])

v2.0/src/controller/game.controller.ts

@@ -37,7 +37,7 @@ export default class Game {
     })
   }
 
-  @checkParams(['activityId'])
+  @checkParams(['activityId', 'isVip'])
   @registeInfos(['vipInfo'])
   @services([CommonGameService])
   @preCheck([checkActivityTime, checkVip, checkGameTimes(3)])

v2.0/src/controller/growShare.controller.ts

@@ -12,7 +12,7 @@ export default class Share {
   /**
    *  完成分享
    */
-  @checkParams(['activityId', 'inviteId'])
+  @checkParams(['activityId', 'inviteId', 'isVip'])
   @registeInfos(['vipInfo'])
   @services([CommonGrowtaskService, CommonStatService])
   @preCheck([checkActivityTime, checkInviteId, checkNewVip, checkHelpRecord])

v2.0/src/controller/growTask.controller.ts

@@ -18,7 +18,7 @@ export default class Task {
   /**
    * 任务列表
    */
-  @checkParams(['activityId'])
+  @checkParams(['activityId', 'isVip'])
   @registeInfos(['vipInfo', 'task'])
   @services([CommonGrowtaskService])
   @preCheck([checkActivityTime])

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

@@ -12,7 +12,7 @@ export default class LoginController {
    *
    *  updateFirstLoginToday({ $inc: { gameTime: 3}})
    */
-  @checkParams(['activityId', 'userNick', 'avatar', 'isFollow'])
+  @checkParams(['activityId', 'userNick', 'avatar', 'isFollow', 'isVip'])
   @noCheckUser
   @registeInfos(['vipInfo'])
   @services([CommonUserService, CommonAccessService])

v2.0/src/controller/share.controller.ts

@@ -21,7 +21,7 @@ export default class Share {
   /**
    *  完成分享
    */
-  @checkParams(['activityId', 'inviteId'])
+  @checkParams(['activityId', 'inviteId', 'isVip'])
   @registeInfos(['vipInfo'])
   @services([CommonTaskService, CommonStatService])
   @preCheck([checkActivityTime, checkInviteId, checkNewVip, checkHelpRecord])

v2.0/src/controller/task.controller.ts

@@ -18,7 +18,7 @@ export default class Task {
   /**
    * 任务列表
    */
-  @checkParams(['activityId'])
+  @checkParams(['activityId', 'isVip'])
   @registeInfos(['vipInfo'])
   @services([CommonTaskService])
   @preCheck([checkActivityTime])

v2.0/src/controller/user.controller.ts

@@ -22,20 +22,20 @@ export default class User {
   /**
    *  获取会员信息
    */
-  @checkParams(['activityId'])
-  @services([CommonUserService])
-  async getVipInfo(
-    context: IContext<IParams>,
-    { activityInfo }: IControllerInfos,
-    [userService]: [CommonUserService]
-  ): Promise<IResult<IVipInfo>> {
-    // 拼接回调参数
-    const result = await userService.getShopVip(context, activityInfo)
-
-    return resultsModel.success(result)
-  }
-
-  /**
+   @checkParams(['activityId', 'isVip'])
+   @services([CommonUserService])
+   async getVipInfo(
+     context: IContext<IParams>,
+     { activityInfo }: IControllerInfos,
+     [userService]: [CommonUserService]
+   ): Promise<IResult<IVipInfo>> {
+     // 拼接回调参数
+     const result = await userService.getShopVip(context, activityInfo)
+ 
+     return resultsModel.success(result)
+   }
+  
+   /**
    *  获取排行榜
    */
   @checkParams(['activityId', 'rankKey?', 'timeKey?', 'limit?'])

v2.0/src/decorator/common/registeInfos.ts

@@ -32,10 +32,6 @@ async function initBaseInfo(context: IContext<IParams>, baseInfos: ICheckControl
   }
 
   if (needInfos.includes('vipInfo') && !baseInfos.vipInfo && handler !== 'getVipInfo') {
-    if (!baseInfos.session) {
-      const { session, userNick } = await getSellerSession(context)
-      baseInfos.session = session
-    }
     const vipInfo = await getShopVip(context, baseInfos.activityInfo, formatVipCbUrl(context))
     baseInfos.vipInfo = vipInfo
   }

v2.0/src/service/common/task.service.ts

@@ -5,7 +5,7 @@
  */
 
 import UserService from './user.service'
-import { getToday, getUserOrderlist, generateVipUrl, formatVipCbUrl, setNewFollowUserData } from '../../utils'
+import { getToday, getUserOrderlist, generateVipUrl, formatVipCbUrl, setNewFollowUserData, setNewVipUserData } from '../../utils'
 import { TASK_RATE_TYPE, TASK_STATUS } from '../../constants'
 import { getTodayCompleteTask, getTotalCompleteTask, setTaskStatus } from '../../utils/common/task'
 import { CODE_TYPES } from '../../errorCode'
@@ -134,6 +134,11 @@ export default class TaskService extends UserService {
         follow: setNewFollowUserData(userInfo.follow)
       }
     }
+    if (taskType === 'member') {
+      updateQuery.$set = {
+        member: setNewVipUserData(userInfo.member)
+      }
+    }
     const result = await this.updateUser(userInfo._id, updateQuery)
     return result ? { ok: 1 } : CODE_TYPES.ERROR_DO_TASK
   }

v2.0/src/utils/common/vip.ts

@@ -28,21 +28,10 @@ export const getShopVip = async (
   callbackUrl: string = ''
 ): Promise<IVipInfo> => {
   const shopUrl = generateVipUrl(callbackUrl)
-  if (isUseVipMock(context, activityInfo)) {
-    return {
-      ...VIP_MOCK,
-      url: shopUrl
-    }
-  }
-  let result = {
-    result: {
-      member_info: ''
-    }
-  }
-  result = await TBAPIS.queryVipinfo(context)
-
+  const { isVip = false } = context.data
+ 
   return {
-    isVip: !!(result.result && result.result.member_info),
+    isVip,
     url: shopUrl
   }
 }