From 22696f52c7a6def80f05b59d3e8555b9011b07cf Mon Sep 17 00:00:00 2001
From: luying <luying@bantus.cn>
Date: Fri, 11 Feb 2022 15:54:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/servers/gm/handler/gmHandler.ts | 6 +++---
 shared/db/Activity.ts                           | 4 ++--
 shared/db/UserOrder.ts                          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts
index 0cf0998d6..1d929233b 100644
--- a/game-server/app/servers/gm/handler/gmHandler.ts
+++ b/game-server/app/servers/gm/handler/gmHandler.ts
@@ -157,8 +157,8 @@ export class GmHandler {
         }
     }
 
-    async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number }, session: BackendSession) {
-        const { activityId, groupId, beginTime, endTime, type, data, timeType = 3, days = 0, delayDay = 0, interval = 0 } = msg;
+    async updateActivity(msg: { activityId: number|string, groupId: number, beginTime: number, endTime: number, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, name: string }, session: BackendSession) {
+        const { activityId, groupId, beginTime, endTime, type, data, timeType = 3, days = 0, delayDay = 0, interval = 0, name = '' } = msg;
         const uid = session.get('uid');
         if (!type || !data) {
             return resResult(STATUS.WRONG_PARMS);
@@ -177,7 +177,7 @@ export class GmHandler {
         let checkGroup = await checkActivityGroupTypeWithId(groupId, activities);
         if(!checkGroup) return resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE);
 
-        activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, timeType, days, delayDay, interval, uid);
+        activities = await ActivityModel.addActivity(aids, groupId, beginTime ? new Date(beginTime) : undefined, endTime ? new Date(endTime) : undefined, type, data, timeType, days, delayDay, interval, name, uid);
 
         
         let activityServers = pinus.app.getServersByType('activity');
diff --git a/shared/db/Activity.ts b/shared/db/Activity.ts
index d75969775..f95197635 100644
--- a/shared/db/Activity.ts
+++ b/shared/db/Activity.ts
@@ -76,13 +76,13 @@ export default class Activity extends BaseModel {
     }
 
     //新增活动
-    public static async addActivity(aids: number[], groupId: number, beginTime: Date, endTime: Date, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, uid = 1) {
+    public static async addActivity(aids: number[], groupId: number, beginTime: Date, endTime: Date, type: number, data: string, timeType: number, days: number, delayDay: number, interval: number, name: string, uid = 1) {
         let result: ActivityModelType[] = [];
         let newAids = [];
         for (let activityId of aids) {
             if (!activityId) activityId = await CounterModel.getNewCounter(COUNTER.ACTIVITY);
             newAids.push(activityId);
-            let update = { type, data, timeType, days, delayDay, interval, groupId }
+            let update = { type, data, timeType, days, delayDay, interval, groupId, name }
             if (beginTime != undefined) {
                 update["beginTime"] = beginTime;
             }
diff --git a/shared/db/UserOrder.ts b/shared/db/UserOrder.ts
index ade7133f7..0ac9bda26 100644
--- a/shared/db/UserOrder.ts
+++ b/shared/db/UserOrder.ts
@@ -1,7 +1,7 @@
 import BaseModel from './BaseModel';
 import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { ORDER_STATE } from '../consts';
-import { SearchOrderParam } from '@domain/backEndField/search';
+import { SearchOrderParam } from '../domain/backEndField/search';
 
 /**
   * 玩家充值订单