This commit is contained in:
luying
2022-04-12 11:05:45 +08:00
parent 5872c48135
commit 03dc4e5956
3 changed files with 18 additions and 7 deletions
@@ -17,7 +17,7 @@ import { sendUngotDividend } from '../../../services/auctionService';
import { taflush } from '../../../services/sdkService'; import { taflush } from '../../../services/sdkService';
import { ActivityInRemote } from '../../../domain/activityField/activityField'; import { ActivityInRemote } from '../../../domain/activityField/activityField';
import { pushCurrentTime } from '../../../services/auctionService'; import { pushCurrentTime } from '../../../services/auctionService';
import { SurveyModel } from '../../../db/Survery'; import { SurveyModel, SurveyUpdate } from '../../../db/Survery';
import { getSurvey } from '../../../services/gmService'; import { getSurvey } from '../../../services/gmService';
import { sendMessageToAllWithSuc } from '../../../services/pushService'; import { sendMessageToAllWithSuc } from '../../../services/pushService';
let timer: NodeJS.Timer; let timer: NodeJS.Timer;
@@ -389,12 +389,18 @@ export class GmHandler {
} }
async updateSurvey(msg: { code: string, surveyId: string, beginTim: number, endTime: number, isEnable: boolean, surverLink: string, surveyName: string, roleIndex: number, goods: string, mailContent: string }, session: BackendSession) { async updateSurvey(msg: { code: string, surveyId: string, beginTim: number, endTime: number, isEnable: boolean, surverLink: string, surveyName: string, roleIndex: number, goods: string, mailContent: string }, session: BackendSession) {
let update: SurveyUpdate = msg;
let reward = JSON.parse(msg.goods); if(msg.goods) {
let reward = JSON.parse(msg.goods);
let result = await SurveyModel.updateSurvey(msg.code, {...msg, reward}, SURVEY_SELECT.FIND); update.reward = reward;
}
let origin = await SurveyModel.findByCode(msg.code);
let result = await SurveyModel.updateSurvey(msg.code, update, SURVEY_SELECT.FIND);
if(!result) return resResult(STATUS.WRONG_PARMS); if(!result) return resResult(STATUS.WRONG_PARMS);
await sendMessageToAllWithSuc(PUSH_ROUTE.UPDATE_SURVEY, { survey: result });
if(origin && origin.isEnable != result.isEnable) {
await sendMessageToAllWithSuc(PUSH_ROUTE.UPDATE_SURVEY, { survey: result });
}
return resResult(STATUS.SUCCESS); return resResult(STATUS.SUCCESS);
} }
+1 -1
View File
@@ -77,7 +77,7 @@ const modules = [
{ id: 23, type: 'guildActivity', init: false, refresh: true, guild: true }, { id: 23, type: 'guildActivity', init: false, refresh: true, guild: true },
{ id: 24, type: 'donate', init: false, refresh: true, guild: true }, { id: 24, type: 'donate', init: false, refresh: true, guild: true },
{ id: 25, type: 'shop', init: false, refresh: true, guild: false }, { id: 25, type: 'shop', init: false, refresh: true, guild: false },
{ id: 26, type: 'survey', init: false, refresh: false, guild: false }, { id: 26, type: 'survey', init: false, refresh: true, guild: false },
] ]
export async function pushData(hasInit: boolean, role: RoleType, session: FrontendOrBackendSession, pushType: 'entry' | 'refresh' = 'entry') { export async function pushData(hasInit: boolean, role: RoleType, session: FrontendOrBackendSession, pushType: 'entry' | 'refresh' = 'entry') {
+5
View File
@@ -52,6 +52,11 @@ export default class Survey extends BaseModel {
return rec; return rec;
} }
public static async findByCode(code: string) {
let rec: SurveyType = await SurveyModel.findOne({ code }).lean();
return rec;
}
public static async updateSurvey(code: string, param: SurveyUpdate, select = '') { public static async updateSurvey(code: string, param: SurveyUpdate, select = '') {
if(code == 'new') code = genCode(6); if(code == 'new') code = genCode(6);
let rec: SurveyType = await SurveyModel.findOneAndUpdate({ code }, { $set: {...param, code} }, {new: true, upsert: true}).select(select).lean(); let rec: SurveyType = await SurveyModel.findOneAndUpdate({ code }, { $set: {...param, code} }, {new: true, upsert: true}).select(select).lean();