活动：修复累充

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

@@ -279,12 +279,12 @@ export function _getActivityById(activityId: number) {
 }
 
 export function _getActivitiesByType(serverId: number, type: number) {
-    let activityByType = pinus.app.get('activityByType')?.get(serverId)?.get(type)||[];
+    let activityByType = pinus.app.get('activityByType')?.get(serverId)?.get(type)??[];
     let activities: Map<number, ActivityInRemote> = pinus.app.get('activities');
     let result: ActivityInRemote[] = [];
     for(let activityId of activityByType) {
         let activity = activities.get(activityId);
-        if(activity && activity.beginTime <= Date.now() && activity.endTime >= Date.now()) {
+        if(activity && activity.isEnable) {
             result.push(activity);
         }
     }

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

@@ -132,7 +132,7 @@ export function rewardItemData(reward: Array<RewardParam>) {
                 break;
             case ACTIVITY_RESOURCES_TYPE.GIFTPACKAGE://配置成礼包会立刻兑换，配置成物品会把礼包放入背包中
                 let goodData = gameData.goods.get(obj.id);//礼包物品
-                let giftPackageData = gameData.giftPackage.get(1)//gameData.giftPackage.get(goodData.gift);//礼包数据
+                let giftPackageData = gameData.giftPackage.get(goodData.gift);//礼包数据
                 let giftReward = rewardItemData(giftPackageData.reward)
                 goods = goods.concat(giftReward.goods)
                 heroes = heroes.concat(giftReward.heroes)

game-server/app/services/orderService.ts

@@ -284,7 +284,7 @@ export async function settleOrderFromRedisPub(message: string) {
 
     let aliOrderID = params.order_id;
 
-    let result = await settleOrder(order, params.sid);
+    let result = await settleOrder(order, parseInt(`${params.sid}`));
     await UserOrderModel.saveOrderID(order.roleId, order.localOrderID, aliOrderID, JSON.stringify(result));
 
     return true