活动：首冲活动添加查询是否结束相关逻辑

game-server/app/services/dailyRMBGiftsService.ts

@@ -18,10 +18,8 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
-    activityArray = activityArray.sort((a, b) => {
-        return a.activityId - b.activityId
-    });
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
+
     let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];

game-server/app/services/firstGiftService.ts

@@ -1,7 +1,7 @@
 import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
-import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftField';
+import { FirstGiftData } from '../domain/activityField/firstGiftField';
 
 /**
    * 获取活动数据
@@ -13,16 +13,20 @@ import { FirstGiftData, FirstGiftItem } from '../domain/activityField/firstGiftF
    */
 
 export async function firstGiftActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, true)
-    activityArray = activityArray.sort((a, b) => {
-        return a.activityId - b.activityId
-    });
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, 1)
+
     if (activityArray.length == 0) {
         return null;
     }
     let activityData = activityArray[0];
-    let playerData = await getPlayerFirstGiftData(activityData.activityId, serverId, roleId);
-    return playerData
+    let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityData.activityId, roleId);
+    if (playerRecord.isOver) {
+        return true;
+    }
+
+    let playerData = new FirstGiftData(activityData);
+    playerData.setPlayerRecords(playerRecord);
+    return playerData;
 }
 
 /**

game-server/app/services/growthFundService.ts

@@ -22,10 +22,8 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
   GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
 */
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
-    activityArray = activityArray.sort((a, b) => {
-        return a.activityId - b.activityId
-    });
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
+
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];
         let playerData = await getPlayerGrowthFundData(activityData.activityId, serverId, roleId);

game-server/app/services/orderService.ts

@@ -9,6 +9,8 @@ import { makeMonthlyTicketReward } from './monthlyTicketService';
 import { makeSignInVIP } from './signInService';
 import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
 import { makePopUpShopReward } from './popUpShopService';
+import { ActivityModel, ActivityModelType } from '../db/Activity';
+import { ActivityFirstGiftModel } from '../db/ActivityFirstGift';
 
 
 
@@ -39,6 +41,15 @@ export async function makeOrder(localOrderID: string, sid: string) {
 
     const roleInfo = await RoleModel.findByRoleId(roleId);
 
+    //首冲礼包
+    {
+        let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(orderInfo.serverId, ACTIVITY_TYPE.FIRST_GIFT, new Date())
+        for (let obj of activityArray) {
+            await ActivityFirstGiftModel.begin(obj.activityId, roleId);
+        }
+    }
+
+
     switch (productType) {
         case ACTIVITY_TYPE.SIGN_IN_VIP:
             {

game-server/app/services/thirtyDaysService.ts

@@ -18,10 +18,8 @@ import { deltaDays } from '../pubUtils/util';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, true)
-    activityArray = activityArray.sort((a, b) => {
-        return a.activityId - b.activityId
-    });
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, type, 1)
+
     let allPlayerActivity = [];
     for (let i = 0; i < activityArray.length; i++) {
         let activityData = activityArray[i];

game-server/app/services/yuanbaoService.ts

@@ -15,10 +15,7 @@ import { addReward, stringToRewardParam } from './giftPackageService';
    */
 
 export async function yuanbaoActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, true)
-    activityArray = activityArray.sort((a, b) => {
-        return b.activityId - a.activityId
-    });
+    let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.YUAN_BAO_SHOP, -1)
     if (activityArray.length == 0) {
         return null;
     }