活动：首充增加页签

game-server/app/servers/activity/handler/firstGiftHandler.ts

@@ -5,6 +5,7 @@ import { getPlayerFirstGiftData } from '../../../services/activity/firstGiftServ
 import { RoleModel } from '../../../db/Role';
 import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
 import { ActivityFirstGiftModel } from '../../../db/ActivityFirstGift';
+import { RewardParam } from '../../../domain/activityField/rewardField';
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -48,8 +49,8 @@ export class FirstGiftHandler {
         * @param {BackendSession} session
         * @memberof FirstGiftHandler
         */
-    async getFirstGiftReward(msg: { activityId: number, index: number }, session: BackendSession) {
-        const { activityId, index } = msg;
+    async getFirstGiftReward(msg: { activityId: number, pageIndex: number }, session: BackendSession) {
+        const { activityId, pageIndex } = msg;
         const roleId = session.get('roleId');
         const serverId = session.get('serverId');
         const sid = session.get('sid');
@@ -60,28 +61,30 @@ export class FirstGiftHandler {
         if (!playerData) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }
-        if (playerData.state === FIRST_GIFT_STATE.CLOSED) {
+
+        let playerPageData = playerData.findPageByIndex(pageIndex);
+        if (playerPageData.state === FIRST_GIFT_STATE.NOT_PAY) {
             return resResult(STATUS.ACTIVITY_FIRST_GIFT_NOT_OPEN);
         }
-        let items = playerData.canReceiveItems();
+        let items = playerPageData.getCanReceiveItems();
         if (items.length === 0) {
             return resResult(STATUS.ACTIVITY_REWARDED);
         }
-        let rewardArray = [];
-        let indexArray = [];
+        let rewardArray: RewardParam[] = [];
+        let indexArray: number[] = [];
         for (let item of items) {
-            rewardArray = rewardArray.concat(stringToRewardParam(item.reward))
+            rewardArray.push(...stringToRewardParam(item.reward));
             indexArray.push(item.index)
             item.isReceive = true;
         }
         let result = await addReward(roleId, roleName, sid, serverId, rewardArray, ITEM_CHANGE_REASON.FIRST_GIFT);
 
-        let isOver = playerData.isComplete();
+        let isOver = playerPageData.isComplete();
 
-        await ActivityFirstGiftModel.addRecord(activityId, roleId, indexArray, isOver);
+        await ActivityFirstGiftModel.addRecord(activityId, roleId, pageIndex, indexArray, isOver);
 
         return resResult(STATUS.SUCCESS, Object.assign(result, {
-            param: { activityId },
+            param: { activityId, pageIndex },
             items: items
         }));
     }

game-server/app/servers/gm/handler/gmOrderHandler.ts

@@ -6,7 +6,7 @@ import _ = require('underscore');
 import { dicRMB } from '../../../pubUtils/dictionary/DicRMB';
 import { getActivityById } from '../../../services/activity/activityService';
 import { UserOrderModel } from '../../../db/UserOrder';
-import { makeOrder, settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
+import { settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
 import { getActivityProducts, getParamStr } from '../../../services/gmService';
 import { ActivityGroupModel } from '../../../db/ActivityGroup';
 import { Receiver } from '../../../db/GMMail';

game-server/app/servers/order/handler/orderHandler.ts

@@ -7,7 +7,7 @@ import _ = require('underscore');
 import { applyOrderWX, checkOrderWX } from '../../../services/pay/weixinPay';
 import { applyOrderALI, checkOrderALI } from '../../../services/pay/aliPay';
 import { applyOrder37 } from '../../../services/pay/37Pay';
-import { makeOrder, settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
+import { settleOrder, settleOrderAli, settleOrderWx } from '../../../services/orderService';
 import { addRechargeMoney } from '../../../services/activity/rechargeMoneyService';
 import { addVipRechargeMoney } from '../../../services/activity/vipRechargeMoneyService';
 import { checkActivityTask } from '../../../services/taskService';