活动：弹出商店结算奖励修改

game-server/app/services/orderService.ts

@@ -8,6 +8,7 @@ import { RoleModel } from '../db/Role';
 import { makeMonthlyTicketReward } from './monthlyTicketService';
 import { makeSignInVIP } from './signInService';
 import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
+import { makePopUpShopReward } from './popUpShopService';
 
 
 
@@ -70,6 +71,11 @@ export async function makeOrder(localOrderID: string, sid: string) {
                 let resule = await makeDailyRMBGiftsReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
                 break;
             }
+        case ACTIVITY_TYPE.POP_UP_SHOP:
+            {
+                let resule = await makePopUpShopReward(roleId, roleInfo.roleName, sid, orderInfo.serverId, roleInfo.funcs, orderInfo.activityId, orderInfo.productID)
+                break;
+            }
         default:
             return '未知商品类型';
     }

game-server/app/services/popUpShopService.ts

@@ -66,17 +66,27 @@ export async function getPlayerPopUpShopData(activityId: number, serverId: numbe
    * @param {string} productID 商品ID
    *
    */
-export async function makeDailyRMBGiftsReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
+export async function makePopUpShopReward(roleId: string, roleName: string, sid: string, serverId: number, funcs: number[],
     activityId: number, productID: string) {
-    // let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
-    // let playerData = new popUpSHopField(activityData);
-    // let bigGiftProductID = playerData.productID;
-    // if (bigGiftProductID == productID) {//一次性购买7天礼包
-    //     return { goods: [], addHeros: [] }
-    // } else {
-    //     let item = playerData.findProduct(productID);
-    //     let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
-    //     let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
-    //     return result
-    // }
+    let activityData: ActivityModelType = await ActivityModel.findActivity(activityId, true);
+    if (!activityData) {
+        return null;
+    }
+    let allTaskData: any[] = JSON.parse(activityData.data);
+    let taskIndex = allTaskData.findIndex(obj => { return obj && obj.data.productID == productID });
+    if (taskIndex == -1) {
+        return null;
+    }
+    let playerData = new PopUpShopData(allTaskData[taskIndex]);
+    let taskId = playerData.taskId;
+    let item = playerData.findItemByProductID(productID);
+
+    let playerRecords: ActivityPopUpShopModelType = await ActivityPopUpShopModel.addRecord(serverId, activityId, roleId, taskId, item.id);
+    if (!playerRecords) {
+        return null;
+    }
+
+    let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.reward);
+    let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
+    return result
 }