弹出礼包：装备精炼计算方式修改

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

@@ -14,6 +14,7 @@ import { getRandEelm, getRandSingleEelm } from '../../pubUtils/util';
 import { getAllOnlineRoles } from '../redisService';
 import { GachaResultIndb } from '../../domain/activityField/gachaField';
 import { gameData } from '../../pubUtils/data';
+import { ActivityPopUpShopRecModel } from '../../db/ActivityPopUpShopRec';
 
 /**
    * 玩家活动数据
@@ -98,8 +99,15 @@ export async function checkPopUpConditions(serverId: number, roleId: string, con
                 if( !pkg.checkPackageCanPush(conditionType)) { // 筛选推送
                     continue;
                 }
+                let effectTimes = await pkg.getEffectTime();
+                if(conditionType == POP_UP_SHOP_CONDITION_TYPE.EQUIP_STAR) {
+                    let result = await ActivityPopUpShopRecModel.addRecord(serverId, activityId, roleId, pkg.id, effectTimes.effectBeginTime, effectTimes.effectEndTime, conditionType, param.equipStar);
+                    param.equipStarSum = result.num;
+                }
+
                 let items = pkg.getItemsByCondition(param);
                 if(items.length > 0) {
+
                     let map = new Map<string, PopShopItem[]>();
                     for(let item of items) {
                         if(!map.has(item.param)) {
@@ -108,7 +116,6 @@ export async function checkPopUpConditions(serverId: number, roleId: string, con
                         map.get(item.param).push(item);
                     }
                     for(let [_, items] of map) {
-                        let effectTimes = await pkg.getEffectTime();
                         let popUpShopRec = await ActivityPopUpShopModel.createRecord({ 
                             serverId, activityId, roleId, id: pkg.id, 
                             ...effectTimes,
@@ -120,12 +127,12 @@ export async function checkPopUpConditions(serverId: number, roleId: string, con
                 }
             }
         }
-        console.log('##### 5', pushItems.length)
+        // console.log('##### 5', pushItems.length)
         if(pushItems.length > 0) {
             pushData.push({ activityId, activityType, param: { popUpShopItems: pushItems } });
         }
     }
-    console.log('##### 6', pushData.length)
+    // console.log('##### 6', pushData.length)
     return await pushActivities(pushData, roleId, sid);
 
 }