军团:权限判断函数提取
This commit is contained in:
@@ -9,10 +9,11 @@ import { GuildModel } from '../../../db/Guild';
|
||||
import { handleCost, addItems } from '../../../services/rewardService';
|
||||
import { CHAT_SERVER, GUILD_POINT_WAYS } from '../../../consts';
|
||||
import { getDonation } from '../../../services/donateService';
|
||||
import { getUserGuildWithRefActive } from '../../../services/guildService';
|
||||
import { getUserGuildWithRefActive, refreshUserGuild } from '../../../services/guildService';
|
||||
import { ARMY } from '../../../pubUtils/dicParam';
|
||||
import { addActive } from '../../../services/guildService'
|
||||
import { checkActivityTask, checkTask } from '../../../services/taskService';
|
||||
import { guildInter } from '../../../pubUtils/interface';
|
||||
export default function (app: Application) {
|
||||
new HandlerService(app, {});
|
||||
return new DonationHandler(app);
|
||||
@@ -27,11 +28,12 @@ export class DonationHandler {
|
||||
* @param msg
|
||||
* @param session
|
||||
*/
|
||||
async getDonation(msg: {}, session: BackendSession) {
|
||||
async getDonation(msg: guildInter & {}, session: BackendSession) {
|
||||
const roleId: string = session.get('roleId');
|
||||
const serverId: number = parseInt(session.get('serverId'));
|
||||
const { myUserGuild } = msg;
|
||||
|
||||
let userGuild = await getUserGuildWithRefActive(roleId, 'donateCnt receiveBoxs guildCode');
|
||||
let userGuild = await refreshUserGuild(myUserGuild, roleId);
|
||||
if (!userGuild)
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
const { guildCode: code, donateCnt, receiveBoxs } = userGuild;
|
||||
@@ -43,16 +45,15 @@ export class DonationHandler {
|
||||
* @param msg
|
||||
* @param session
|
||||
*/
|
||||
async donate(msg: { id: number }, session: BackendSession) {
|
||||
const { id } = msg;
|
||||
async donate(msg: guildInter & { id: number }, session: BackendSession) {
|
||||
const { id, myUserGuild } = msg;
|
||||
const roleId: string = session.get('roleId');
|
||||
const roleName: string = session.get('roleName');
|
||||
const serverId: number = parseInt(session.get('serverId'));
|
||||
const sid: string = session.get('sid');
|
||||
const funcs: number[] = session.get('funcs');
|
||||
let userGuild = await getUserGuildWithRefActive(roleId, 'donateCnt receiveBoxs guildCode');
|
||||
if (!userGuild)
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
let userGuild = await refreshUserGuild(myUserGuild, roleId);
|
||||
if (!userGuild) return resResult(STATUS.WRONG_PARMS);
|
||||
const { guildCode: code, donateCnt: resdonateCnt } = userGuild;
|
||||
if (resdonateCnt >= ARMY.ARMY_DONATE_TIMES)
|
||||
return resResult(STATUS.GUILD_DONATE_TIMES_NOT_ENOUGH);
|
||||
@@ -84,13 +85,13 @@ export class DonationHandler {
|
||||
* @param msg
|
||||
* @param session
|
||||
*/
|
||||
async receiveBox(msg: { id: number }, session: BackendSession) {
|
||||
const { id } = msg;
|
||||
async receiveBox(msg: guildInter & { id: number }, session: BackendSession) {
|
||||
const { id, myUserGuild } = msg;
|
||||
const roleId: string = session.get('roleId');
|
||||
const roleName: string = session.get('roleName');
|
||||
const sid: string = session.get('sid');
|
||||
const serverId: number = parseInt(session.get('serverId'));
|
||||
let userGuild = await getUserGuildWithRefActive(roleId, 'donateCnt receiveBoxs guildCode');
|
||||
let userGuild = await refreshUserGuild(myUserGuild, roleId);
|
||||
if (!userGuild)
|
||||
return resResult(STATUS.WRONG_PARMS);
|
||||
const { guildCode: code, receiveBoxs: resReceiveBoxs } = userGuild;
|
||||
|
||||
Reference in New Issue
Block a user