diff --git a/game-server/app/servers/activity/handler/gachaHandler.ts b/game-server/app/servers/activity/handler/gachaHandler.ts
index 00822260c..e3eadb80a 100644
--- a/game-server/app/servers/activity/handler/gachaHandler.ts
+++ b/game-server/app/servers/activity/handler/gachaHandler.ts
@@ -252,7 +252,7 @@ export class GachaHandler {
     * @memberof GachaHandler
     */
     async setPickHero(msg: { gachaId: number, activityId: number, pickHero: number }, session: BackendSession) {
-        const { gachaId, activityId, pickHero } = msg;
+        const { gachaId, activityId = 0, pickHero } = msg;
         const roleId: string = session.get('roleId');
         if (gachaId != GACHA_ID.ASSIGN && gachaId != GACHA_ID.TIMELIMIT)
             return resResult(STATUS.WRONG_PARMS);
diff --git a/shared/db/UserGacha.ts b/shared/db/UserGacha.ts
index efbc92b6c..e438d7f51 100644
--- a/shared/db/UserGacha.ts
+++ b/shared/db/UserGacha.ts
@@ -114,13 +114,13 @@ export default class UserGacha extends BaseModel {
       return rec;
     }
 
-    public static async refreshFreeCount(roleId: string, gachaId: number, aid: number, refFreeTime: Date) {
-      let rec: UserGachaType = await UserGachaModel.findOneAndUpdate({ roleId, gachaId, aid }, { $set: { freeCount: 0, refFreeTime } }, { new: true }).lean({ virtuals: true });
+    public static async refreshFreeCount(roleId: string, gachaId: number, activityId: number, refFreeTime: Date) {
+      let rec: UserGachaType = await UserGachaModel.findOneAndUpdate({ roleId, gachaId, activityId }, { $set: { freeCount: 0, refFreeTime } }, { new: true }).lean({ virtuals: true });
       return rec;
     }
 
-    public static async refreshHopeCount(roleId: string, gachaId: number, aid: number, refHopeTime: Date) {
-      let rec: UserGachaType = await UserGachaModel.findOneAndUpdate({ roleId, gachaId, aid }, { $set: { 'hope.$.hasGet': false, refHopeTime } }, { new: true }).lean({ virtuals: true });
+    public static async refreshHopeCount(roleId: string, gachaId: number, activityId: number, refHopeTime: Date) {
+      let rec: UserGachaType = await UserGachaModel.findOneAndUpdate({ roleId, gachaId, activityId }, { $set: { 'hope.$.hasGet': false, refHopeTime } }, { new: true }).lean({ virtuals: true });
       return rec;
     }
 }