支付回调

game-server/app/servers/activity/handler/gachaHandler.ts

@@ -89,7 +89,7 @@ export class GachaHandler {
         }
         // 给东西
         // console.log('****', heroInfo)
-        let { heroes } = await createHeroes(roleId, roleName, sid, serverId, heroInfo);
+        let { heroes, resultHeroes } = await createHeroes(roleId, roleName, sid, serverId, heroInfo);
         await addItems(roleId, roleName, sid, items);
         // 更新数据
         userGacha = await UserGachaModel.updateInfo(roleId, gachaId, activityId, {
@@ -102,7 +102,7 @@ export class GachaHandler {
         await checkTask(roleId, sid, TASK_TYPE.GASHA, count, true, {});
         //活动统计
         await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GASHA, count)
-        for (let hero of heroes) {
+        for (let hero of resultHeroes) {
             activityData.push({ hid: hero.hid, quality: hero.quality });
         }
         await checkActivityTask(serverId, sid, roleId, TASK_TYPE.GACHA_QUALITY_COUNT, count, { heroes: activityData })
@@ -115,7 +115,9 @@ export class GachaHandler {
         return resResult(STATUS.SUCCESS, {
             gachaId, activityId,
             freeCount, refFreeTime: resultRefFreeTime, count: userGacha.count, point: userGacha.point, floor, hope,
-            heroes, result: resultList
+            heroes: resultHeroes, 
+            addHeros: heroes,
+            result: resultList
         });
     }
 
@@ -203,9 +205,9 @@ export class GachaHandler {
         for (let i = 0; i < count; i++) {
             heroInfo.push({ hid: hero, count: 1 })
         }
-        let { heroes, goods } = await createHeroes(roleId, roleName, sid, serverId, heroInfo);
+        let { heroes, resultHeroes, goods } = await createHeroes(roleId, roleName, sid, serverId, heroInfo);
         let resultList: GachaResult[] = [];
-        for (let h of heroes) {
+        for (let h of resultHeroes) {
             let result = new GachaResult(contentId);
             result.setHero(h.hid);
             resultList.push(result);
@@ -232,7 +234,8 @@ export class GachaHandler {
             point: userGacha.point,
             turntable: userGacha.turntable,
             result: resultList,
-            heroes
+            addHeros: heroes,
+            heroes: resultHeroes
         });
     }
 

game-server/app/servers/activity/handler/newHeroGachaHandler.ts

@@ -95,7 +95,7 @@ export class NewHeroGachaHandler {
         await ActivityNewHeroGachaModel.addRecord(serverId, activityId, roleId, hid, floorCount, JSON.stringify(resultList), hasGetFloor);
 
         // 给东西
-        let { heroes } = await createHeroes(roleId, roleName, sid, serverId, heroInfo);
+        let { heroes, resultHeroes } = await createHeroes(roleId, roleName, sid, serverId, heroInfo);
         await addItems(roleId, roleName, sid, items);
         //固定奖励
         let rewardParamArr: Array<RewardParam> = stringToRewardParam(item.commonReward);
@@ -103,7 +103,7 @@ export class NewHeroGachaHandler {
         let commonResult = await addReward(roleId, roleName, sid, serverId, newRewardParamArr)
 
         return resResult(STATUS.SUCCESS, {
-            hid, activityId, count, randomReward: { heroes, result: resultList }, commonReward: commonResult
+            hid, activityId, count, randomReward: { heroes: resultHeroes, result: resultList }, commonReward: commonResult
 
         });
     }