活动：根据订单获得活动

game-server/app/services/activity/activityService.ts

@@ -41,6 +41,8 @@ import { getGuildChannelSid } from '../chatService';
 import { getGuildPayDataShow } from './guildPayService';
 import { PopUpShopItemShow } from '../../domain/activityField/popUpShopField';
 import { sendMessageToGuildWithSuc, sendMessageToUserWithSuc } from '../pushService';
+import { UserOrderModelType } from '../../db/UserOrder';
+import { isArray } from 'underscore';
 
 /**
    * 获取活动数据
@@ -56,6 +58,7 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
         case ACTIVITY_TYPE.SIGN_IN://签到 4
         case ACTIVITY_TYPE.SIGN_IN_VIP://高级签到 5
         case ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN://新手签到 25
+        case ACTIVITY_TYPE.COMMON_SIGN_IN://通用签到 36
             {
                 activityData = await getPlayerSignInData(activityId, serverId, roleId);
                 break;
@@ -176,11 +179,6 @@ export async function getActivity(serverId: number, roleId: string, guildCode: s
                 activityData = await getPlayerMonopolyData(activityId, serverId, roleId);
                 break;
             }
-        case ACTIVITY_TYPE.COMMON_SIGN_IN://通用签到 36
-            {
-                activityData = await getPlayerSignInData(activityId, serverId, roleId);
-                break;
-            }
         case ACTIVITY_TYPE.NEW_HERO_GIFTS://新将好礼(很多红包，用积分兑换一遍结束) 37
             {
                 activityData = await getPlayerNewHeroGiftsData(activityId, serverId, roleId);
@@ -252,6 +250,15 @@ export async function getActivitiesByType(serverId: number, type: number) {
     return activities.map(transActivityInRemoteToModelType);
 }
 
+export async function getActivitiesByTypes(serverId: number, types: number[]) {
+    let result: ActivityModelType[] = [];
+    for(let type of types) {
+        let activities = await getActivitiesByType(serverId, type);
+        if(activities && isArray(activities)) result.push(...activities);
+    }
+    return result;
+}
+
 export async function getActivities() {
     let serverType = pinus.app.getServerType();
     if(serverType == 'activity') {
@@ -432,4 +439,24 @@ export async function pushActivities(arr: pushActivityInter[], roleId: string, s
 
 export async function pushActivitiesToGuild(arr: pushActivityInter[], guildCode: string) {
     if(arr.length > 0) await sendMessageToGuildWithSuc(guildCode, PUSH_ROUTE.ACTIVITY_UPDATE, { activities: arr })
+}
+
+export async function getActivitiesWithOrder(orderInfo: UserOrderModelType) {
+    let activities: ActivityModelType[] = [];
+    let curActivity = await getActivityById(orderInfo.activityId);
+    if(curActivity) activities.push(curActivity);
+
+    let activitiesWithSum = await getActivitiesByTypes(orderInfo.serverId, [ACTIVITY_TYPE.FIRST_GIFT, ACTIVITY_TYPE.RECHARGE_MONEY, ACTIVITY_TYPE.VIP_RECHARGE_MONEY, ACTIVITY_TYPE.GUILD_PAY]);
+    if(activitiesWithSum && isArray(activitiesWithSum)) activities.push(...activitiesWithSum);
+
+    if(orderInfo.paramStr) { //大富翁商店结算
+        try {
+            let paramObj = JSON.parse(orderInfo.paramStr);
+            let paramActivity = paramObj.activityId && await getActivityById(paramObj.activityId);
+            if(paramActivity) activities.push(paramActivity);
+        } catch(e) {
+            console.error(e);
+        }
+    }
+    return activities;
 }

game-server/app/services/activity/signInService.ts

@@ -1,9 +1,7 @@
 import moment = require('moment');
-import { ACTIVITY_TYPE, REFRESH_TIME, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../../consts';
-import { ActivityModel, ActivityModelType } from '../../db/Activity';
+import { ACTIVITY_TYPE, SERVER_OPEN_TIME, SIGNIN_VIP_OPEN_LIMIT, STATUS } from '../../consts';
+import { ActivityModelType } from '../../db/Activity';
 import { ActivitySignInModel, ActivitySignInModelType } from '../../db/ActivitySignIn';
-import { RoleModel } from '../../db/Role';
-import { ServerlistModel } from '../../db/Serverlist';
 import { SignInData } from '../../domain/activityField/signInField';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
 import { getActivitiesByType, getActivityById } from './activityService';

game-server/app/services/orderService.ts

@@ -124,7 +124,7 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) {
                 rewardResult = await makeShop(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)
                 break;
             }
-        case ACTIVITY_TYPE.SELF_SERVICE_SHOP://自选商店-购买礼包
+        case ACTIVITY_TYPE.SELF_SERVICE_SHOP://自选商店-购买礼包（糜家商队）
             {
                 rewardResult = await makeSelfServerShop(roleId, roleInfo.roleName, sid, orderInfo.serverId, orderInfo.activityId, orderInfo.productID)
                 break;