公告后台

game-server/app/servers/role/handler/taskHandler.ts

@@ -79,7 +79,7 @@ export class ShopHandler {
         }
 
         let goods = await addItems(roleId, roleName, sid, taskReward);
-        if (expItem) {
+        if(expItem && expItem.count > 0) {
             await roleLevelup(roleId, expItem.count, session);
             goods.push(expItem);
         }

gm-server/app/service/Game.ts

@@ -164,12 +164,18 @@ export default class Game extends Service {
         const list = await NoticeModel.findByCondition(page, pageSize, sortField, sortOrder, form);
         const total = await NoticeModel.countByCondition( form )
         return ctx.service.utils.resResult(STATUS.SUCCESS, {
-            list, total
+            list: list.map(cur => {
+                return { ...cur, startTime: cur.startTime.getTime(), endTime: cur.endTime.getTime(), showEndTime: cur.showEndTime.getTime(), showStartTime: cur.showStartTime.getTime()}
+            }), total
         });
     }
 
     public async updateNotice(id: string|number, params: NoticeTypeParam) {
         const { ctx } = this;
+        if(params.startTime) params.startTime = new Date(params.startTime);
+        if(params.endTime) params.endTime = new Date(params.endTime);
+        if(params.showStartTime) params.showStartTime = new Date(params.showStartTime);
+        if(params.showEndTime) params.showEndTime = new Date(params.showEndTime);
         let result = await NoticeModel.updateNotice(id, params);
         if(!result) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
         return ctx.service.utils.resResult(STATUS.SUCCESS);

shared/db/Notice.ts

@@ -20,7 +20,7 @@ export default class Notice extends BaseModel {
   @prop({ required: true })
   type: number;               // 类型 1-公告 2-活动
   @prop({ required: true })
-  content: number;            // 公告内容
+  content: string;            // 公告内容
 
   @prop({ required: true })
   timeStr: string;             // 时间显示
@@ -89,7 +89,7 @@ export default class Notice extends BaseModel {
             sort[sortField] = -1;
         }
     }
-    const result: NoticeType[] = await NoticeModel.find(searchObj).limit(pageSize).skip((page - 1) * pageSize).sort(sort).lean({ getters: true, virtuals: true });
+    const result: NoticeType[] = await NoticeModel.find(searchObj).limit(pageSize).skip((page - 1) * pageSize).sort(sort).select('+sort +showStartTime +showEndTime +serverType +isEnable').lean({ getters: true, virtuals: true });
     return result;
 
   }

shared/pubUtils/dictionary/DicTaskExp.ts

@@ -1,6 +1,6 @@
 // 任务奖励主公经验
-import {readFileAndParse, parseGoodStr} from '../util'
+import { readFileAndParse, } from '../util'
-import { FILENAME, TASK_FUN_TYPE } from '../../consts'
+import { FILENAME, } from '../../consts'
 
 export interface DicTaskExp {
     // 主公等级