提交养成类改动

v2.0/src/controller/awards.controller.ts

@@ -22,7 +22,7 @@ export default class AwardsController {
    */
   @checkParams(['activityId'])
   @services([CommonAwardsService])
-  async getMyPrizeList(
+  async getMyAwardsList(
     context: IContext<IParams>,
     { activityInfo }: IControllerInfos,
     [awardSer]: [CommonAwardsService]
@@ -73,7 +73,7 @@ export default class AwardsController {
   @checkParams(['activityId', 'prizeDataType'])
   @services([CommonAwardsService])
   @preCheck([checkActivityTime])
-  async drawLotteryPrize(
+  async drawLottery(
     context: IContext<IParams>,
     { userInfo }: IControllerInfos,
     [awardSer]: [CommonAwardsService]
@@ -97,7 +97,7 @@ export default class AwardsController {
    */
   @noCheckUser
   @services([CommonBaseService, CommonAwardsService])
-  async endOfActivityRewards(
+  async openPrize(
     context: IContext<IParams>,
     {},
     [commonBaseService, commonAwardsService]: [CommonBaseService, CommonAwardsService]

v2.0/src/controller/base.controller.ts

@@ -30,7 +30,7 @@ export default class BaseController {
   @checkParams(['itemIds'])
   @registeInfos(['session'])
   @services([CommonBaseService])
-  async getItemListByItemIds(
+  async getTaobaoItemList(
     context: IContext<IParams>,
     { session }: IControllerInfos,
     [baseService]: [CommonBaseService]

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

@@ -16,7 +16,7 @@ export default class AwardsController {
    */
   @checkParams(['activityId'])
   @services([CommonAwardsService])
-  async getMyPrizeList(
+  async getMyAwardsList(
     context: IContext<IParams>,
     { activityInfo, userInfo }: IControllerInfos,
     [commonAwardsService]: [CommonAwardsService]
@@ -72,7 +72,7 @@ export default class AwardsController {
   @registeInfos(['session'])
   @services([CommonAwardsService])
   @preCheck([checkActivityTime])
-  async drawLotteryPrize(
+  async drawLottery(
     context: IContext<IParams>,
     { activityInfo, userInfo, session }: IControllerInfos,
     [commonAwardsService]: [CommonAwardsService]
@@ -91,7 +91,7 @@ export default class AwardsController {
    */
   @noCheckUser
   @services([CommonBaseService, CommonAwardsService])
-  async endOfActivityRewards(
+  async openPrize(
     context: IContext<IParams>,
     { activityInfo, userInfo }: IControllerInfos,
     [commonBaseService, commonAwardsService]: [CommonBaseService, CommonAwardsService]

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

@@ -37,7 +37,7 @@ export default class TaskController {
   @registeInfos(['session', 'task'])
   @services([CommonGrowtaskService])
   @preCheck([checkActivityTime, checkGrowTaskLimit, checkExchangeCreditsTask])
-  async doCompleteTask(
+  async completeTask(
     context: IContext<IParams>,
     { activityInfo, userInfo, session, task }: IControllerInfos,
     [commonGrowtaskService]: [CommonGrowtaskService]
@@ -58,7 +58,7 @@ export default class TaskController {
   @checkParams(['activityId', 'taskType', 'rewardsKey'])
   @services([CommonGrowtaskService])
   @preCheck([checkActivityTime, checkRemainTimes])
-  async receiveTaskRewards(
+  async receiveTask(
     context: IContext<IParams>,
     { activityInfo, userInfo }: IControllerInfos,
     [commonGrowtaskService]: [CommonGrowtaskService]
@@ -78,7 +78,7 @@ export default class TaskController {
   @checkParams(['activityId', 'itemIds'])
   @registeInfos(['session'])
   @services([CommonBaseService, CommonGrowtaskService])
-  async getCollectGoodsList(
+  async getCollectGoods(
     context: IContext<IParams>,
     { activityInfo, userInfo, session }: IControllerInfos,
     [commonBaseService, commonGrowtaskService]: [CommonBaseService, CommonGrowtaskService]

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

@@ -45,4 +45,19 @@ export default class UserController {
       ...commonUserGetRankResult2
     })
   }
+
+  /**
+   *  获取用户信息
+   */
+  @checkParams(['activityId'])
+  @services([CommonUserService])
+  async getUserInfo(
+    context: IContext<IParams>,
+    { userInfo }: IControllerInfos,
+    [commonUserService]: [CommonUserService]
+  ) {
+    return resultsModel.success({
+      ...userInfo
+    })
+  }
 }

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])
@@ -42,19 +42,19 @@ export default class Task {
    * 商品相关任务 需要传itemId参数
    * 积分兑换任务 需要传credits参数
    */
-  @checkParams(['activityId', 'taskType', 'itemId?', 'credits?'])
+  @checkParams(['activityId', 'key', 'inviteId?', 'itemId?', 'isVip?', 'credits?'])
   @registeInfos(['session', 'task'])
   @services([CommonGrowtaskService])
   @preCheck([checkActivityTime, checkGrowTaskLimit, checkExchangeCreditsTask])
-  async doCompleteTask(
+  async completeTask(
     context: IContext<IParams>,
     { userInfo, activityInfo, task }: IControllerInfos,
     [growTaskService]: [CommonGrowtaskService]
   ) {
-    const { taskType } = context.data
+    const { key } = context.data
 
     // 更新user表
-    const result = await growTaskService.completeTask(taskType, activityInfo, userInfo, task)
+    const result = await growTaskService.completeTask(context.data.key, activityInfo, userInfo, task)
 
     return resultsModel.success(result)
   }
@@ -63,18 +63,18 @@ export default class Task {
    * 领取任务奖励
    * 领取的奖励增加的key值  如: gameTimes  前端传入
    */
-  @checkParams(['activityId', 'taskType', 'rewardsKey'])
+  @checkParams(['activityId', 'key', 'rewardsKey'])
   @services([CommonGrowtaskService])
   @preCheck([checkActivityTime, checkRemainTimes])
-  async receiveTaskRewards(
+  async receiveTask(
     context: IContext<IParams>,
     { userInfo }: IControllerInfos,
     [growTaskService]: [CommonGrowtaskService]
   ): Promise<IResult<{ rewards: number }>> {
     const { rewardsKey } = context.data
-    const { taskType } = context.data
+    const { key } = context.data
 
-    const rewardsResult = await growTaskService.receiveTaskRewards(taskType, rewardsKey, userInfo)
+    const rewardsResult = await growTaskService.receiveTaskRewards(context.data.key, rewardsKey, userInfo)
 
     return resultsModel.success(rewardsResult)
   }
@@ -85,7 +85,7 @@ export default class Task {
   @checkParams(['activityId', 'itemIds'])
   @registeInfos(['session'])
   @services([CommonBaseService, CommonGrowtaskService])
-  async getCollectGoodsList(
+  async getCollectGoods(
     context: IContext<IParams>,
     { session, userInfo }: IControllerInfos,
     [commonBaseService, growTaskService]: [CommonBaseService, CommonGrowtaskService]

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/task.controller.ts

@@ -46,7 +46,7 @@ export default class Task {
   @registeInfos(['session'])
   @services([CommonTaskService])
   @preCheck([checkActivityTime, checkTaskLimit, checkExchangeCreditsTask])
-  async doCompleteTask(
+  async completeTask(
     context: IContext<IParams>,
     { userInfo, activityInfo }: IControllerInfos,
     [taskService]: [CommonTaskService]
@@ -66,7 +66,7 @@ export default class Task {
   @checkParams(['activityId', 'taskType', 'rewardsKey'])
   @services([CommonTaskService])
   @preCheck([checkActivityTime, checkRemainTimes])
-  async receiveTaskRewards(
+  async receiveTask(
     context: IContext<IParams>,
     { userInfo }: IControllerInfos,
     [taskService]: [CommonTaskService]
@@ -85,7 +85,7 @@ export default class Task {
   @checkParams(['activityId', 'itemIds'])
   @registeInfos(['session'])
   @services([CommonBaseService, CommonTaskService])
-  async getCollectGoodsList(
+  async getCollectGoods(
     context: IContext<IParams>,
     { session, userInfo }: IControllerInfos,
     [commonBaseService, commonTaskService]: [CommonBaseService, CommonTaskService]

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

@@ -52,4 +52,19 @@ export default class User {
       ...list
     })
   }
+
+  /**
+   *  获取用户信息
+   */
+  @checkParams(['activityId'])
+  @services([CommonUserService])
+  async getUserInfo(
+    context: IContext<IParams>,
+    { userInfo }: IControllerInfos,
+    [commonUserService]: [CommonUserService]
+  ) {
+    return resultsModel.success({
+      ...userInfo
+    })
+  }
 }

v2.0/src/index.ts

@@ -22,18 +22,18 @@ export default {
   getVipInfo: CommonUserControllerInstance.getVipInfo,
   getRankList: CommonUserControllerInstance.getRankList,
   getTaskList: CommonTaskControllerInstance.getTaskList,
-  doCompleteTask: CommonTaskControllerInstance.doCompleteTask,
-  receiveTaskRewards: CommonTaskControllerInstance.receiveTaskRewards,
-  getCollectGoodsList: CommonTaskControllerInstance.getCollectGoodsList,
+  completeTask: CommonTaskControllerInstance.completeTask,
+  receiveTask: CommonTaskControllerInstance.receiveTask,
+  getCollectGoods: CommonTaskControllerInstance.getCollectGoods,
   login: CommonLoginControllerInstance.login,
   getActivityBaseInfoById: CommonBaseControllerInstance.getActivityBaseInfoById,
   addStat: CommonStatControllerInstance.addStat,
   getStats: CommonStatControllerInstance.getStats,
-  getMyPrizeList: CommonAwardsControllerInstance.getMyPrizeList,
+  getMyAwardsList: CommonAwardsControllerInstance.getMyAwardsList,
   receiveObjectPrize: CommonAwardsControllerInstance.receiveObjectPrize,
   receiveEnamePrize: CommonAwardsControllerInstance.receiveEnamePrize,
-  drawLotteryPrize: CommonAwardsControllerInstance.drawLotteryPrize,
-  endOfActivityRewards: CommonAwardsControllerInstance.endOfActivityRewards,
+  drawLottery: CommonAwardsControllerInstance.drawLottery,
+  openPrize: CommonAwardsControllerInstance.openPrize,
   getShareInfo: CommonShareControllerInstance.getShareInfo,
   doHelp: CommonShareControllerInstance.doHelp,
   testAddStat: CustomTest1ControllerInstance.testAddStat,

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

@@ -68,6 +68,7 @@ export default class AwardsService extends UserService {
   async getMyPrizeList(activityInfo: IActivityInfo) {
     const { openId } = this.context
     const { activityId } = this.context.data
+    // 默认返回我的奖品所有字段，除谢谢参与以外
     const myPrizeList = await this.getAwardsInfoList(
       {
         openId,
@@ -75,18 +76,6 @@ export default class AwardsService extends UserService {
         type: { $ne: PRIZE_TYPE.THANKS }
       },
       {
-        projection: {
-          _id: 1,
-          name: 1,
-          image: 1,
-          type: 1,
-          drawStatus: 1,
-          shipStatus: 1,
-          remark: 1,
-          useUrl: 1,
-          shipCompany: 1,
-          shipNum: 1
-        },
         sort: {
           createTime: -1
         }
@@ -211,7 +200,7 @@ export default class AwardsService extends UserService {
     if ((result as IAwards).remark) {
       return generateCodeTypeWithMsg(CODE_TYPES.SYSTEM_ERROR, (result as IAwards).remark)
     }
-    return result
+    return { drawStatus: (result as IAwards).drawStatus, remark: (result as IAwards).remark }
   }
 
   async drawLottery(activityId: string, prizeDataType: number, userInfo: IUserInfo) {
@@ -249,7 +238,7 @@ export default class AwardsService extends UserService {
       prize = thanksPrize
     }
 
-    const { type, _id, ename, image, name, useUrl, credits } = prize
+    const { type, _id, ename, image, name, useUrl, credits, benefitType } = prize
 
     const { userNick } = userInfo
     let record = {
@@ -266,6 +255,7 @@ export default class AwardsService extends UserService {
       image,
       credits: +credits,
       userNick,
+      benefitType,
       createDay: getToday()
     }
 
@@ -276,7 +266,8 @@ export default class AwardsService extends UserService {
       id: result,
       type,
       name,
-      image
+      image,
+      benefitType
     }
   }
 

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

@@ -38,8 +38,15 @@ export default class GameService extends UserService {
     }
 
     const id = await this.joindao.insertOne(record)
+    const gameCount = await this.joindao.count({
+      activityId,
+      openId
+    })
 
-    return { id }
+    return {
+      gameId: id,
+      isFirstGame: gameCount < 1
+    }
   }
 
   async submitGame(

v2.0/src/typings/awards.d.ts

@@ -14,7 +14,7 @@ interface ICommonAwards {
   type: number
   image: string
   name: string
-  drawStatus: number
+  drawStatus?: number
   receiveName?: string
   userNick?: string
   phone?: string
@@ -32,4 +32,12 @@ interface ICommonAwards {
   updateTime?: number
   awardsType?: string
   expiredTime?: number
+  avatar?: string
+  createDay: string
+  prizeDataType: number
+  benefitType?: number
+  useUrl?: string
+  itemId?: string
+  key?: string
+  openDay?: string
 }

v2.0/src/typings/prizeConfig.d.ts

@@ -29,4 +29,5 @@ interface ICommonActivityPrize {
   deleteStatus?: number
   createTime?: number
   updateTime?: number
+  benefitType?: number
 }