xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "✨ feat(db): 给GiftCodeDetail添加只读库"

Browse Source 
This reverts commit 2f9b489b237af4cd029e3d2724f50dc02c3ac6f6.
This commit is contained in:
luying
2023-05-08 09:57:52 +08:00
parent 9e9f53fd44
commit 70c5ee2bea
6 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
game-server/app/servers/role/handler/itemHandler.ts
View File

@@ -10,7 +10,7 @@ import { ITID } from "../../../consts/constModules/itemConst";
import { useGiftPackage } from "../../../services/activity/giftPackageService"; import { useGiftPackage } from "../../../services/activity/giftPackageService";
import { getAp, setAp, setApBuyTimes } from "../../../services/actionPointService"; import { getAp, setAp, setApBuyTimes } from "../../../services/actionPointService";
import { ActionPointModel } from "../../../db/ActionPoint"; import { ActionPointModel } from "../../../db/ActionPoint";
import GiftCodeDetail from "../../../db/GiftCodeDetail"; import { GiftCodeDetailModel } from "../../../db/GiftCodeDetail";
import GiftCode from "../../../db/GiftCode"; import GiftCode from "../../../db/GiftCode";
import { nowSeconds } from "../../../pubUtils/timeUtil"; import { nowSeconds } from "../../../pubUtils/timeUtil";
import { AP } from "../../../pubUtils/dicParam"; import { AP } from "../../../pubUtils/dicParam";
@@ -168,7 +168,7 @@ export class ItemHandler {
const channel: string = session.get('channel'); const channel: string = session.get('channel');
const { code } = msg; const { code } = msg;
let giftCodeDetail = await GiftCodeDetail.findByCode(code); let giftCodeDetail = await GiftCodeDetailModel.findByCode(code);
if(!giftCodeDetail) { if(!giftCodeDetail) {
return resResult(STATUS.GIFT_CODE_NOT_FOUND); return resResult(STATUS.GIFT_CODE_NOT_FOUND);
} }
@@ -191,13 +191,13 @@ export class ItemHandler {
return resResult(STATUS.YOU_HAVE_USED_THIS_CODE); return resResult(STATUS.YOU_HAVE_USED_THIS_CODE);
} }
let checkHasUse = await GiftCodeDetail.checkHasUsed(roleId, giftCodeDetail.giftId) let checkHasUse = await GiftCodeDetailModel.checkHasUsed(roleId, giftCodeDetail.giftId)
if(checkHasUse) { if(checkHasUse) {
return resResult(STATUS.YOU_HAVE_USED_THIS_CODE); return resResult(STATUS.YOU_HAVE_USED_THIS_CODE);
} }
await GiftCodeDetail.increaseUsedNum(code, roleId, roleName, serverId); await GiftCodeDetailModel.increaseUsedNum(code, roleId, roleName, serverId);
await GiftCode.increaseUsedNum(giftCode.id); await GiftCode.increaseUsedNum(giftCode.id);
let goods = await addItems(roleId, roleName, sid, giftCode.goods, ITEM_CHANGE_REASON.USE_GIFT_CODE); let goods = await addItems(roleId, roleName, sid, giftCode.goods, ITEM_CHANGE_REASON.USE_GIFT_CODE);

1
game-server/app/services/sdkService.ts
View File

@@ -23,6 +23,7 @@ import { GuildLeader } from "../domain/rank";
import { initTaLoggingMode } from "./sdk/ta"; import { initTaLoggingMode } from "./sdk/ta";
import { DicPushMessage } from "../pubUtils/dictionary/DicPushMessage"; import { DicPushMessage } from "../pubUtils/dictionary/DicPushMessage";
import GiftCode from "../db/GiftCode"; import GiftCode from "../db/GiftCode";
import { GiftCodeDetailModel } from "../db/GiftCodeDetail";
// 检查私聊是否合法 // 检查私聊是否合法

12
gm-server/app/service/users.ts
View File

@@ -9,7 +9,7 @@ import { gameData } from '@pubUtils/data';
import { smsModel } from '@db/Sms'; import { smsModel } from '@db/Sms';
import { isString } from 'underscore'; import { isString } from 'underscore';
import GiftCode from '@db/GiftCode'; import GiftCode from '@db/GiftCode';
import GiftCodeDetail from '@db/GiftCodeDetail'; import GiftCodeDetail, { GiftCodeDetailModel } from '@db/GiftCodeDetail';
import { deletRole } from '@pubUtils/roleUtil'; import { deletRole } from '@pubUtils/roleUtil';
import { RScriptRecordModel } from '@db/RScriptRecord'; import { RScriptRecordModel } from '@db/RScriptRecord';
import { DicWar } from '@pubUtils/dictionary/DicWar'; import { DicWar } from '@pubUtils/dictionary/DicWar';
@@ -532,7 +532,7 @@ export default class GMUsers extends Service {
if(!isNumber(count) || !params.checkParams()) return ctx.service.utils.resResult(STATUS.WRONG_PARMS); if(!isNumber(count) || !params.checkParams()) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
let giftCode = await GiftCode.createData(params); let giftCode = await GiftCode.createData(params);
await GiftCodeDetail.generateMany(giftCode, count, ctx.user?.uid); await GiftCodeDetailModel.generateMany(giftCode, count, ctx.user?.uid);
return ctx.service.utils.resResult(STATUS.SUCCESS, giftCode); return ctx.service.utils.resResult(STATUS.SUCCESS, giftCode);
} }
@@ -552,7 +552,7 @@ export default class GMUsers extends Service {
let giftCode = await GiftCode.findByGiftId(id); let giftCode = await GiftCode.findByGiftId(id);
if(!giftCode) return ctx.service.utils.resResult(STATUS.DB_DATA_NOT_FOUND); if(!giftCode) return ctx.service.utils.resResult(STATUS.DB_DATA_NOT_FOUND);
await GiftCodeDetail.generateMany(giftCode, count, ctx.user?.uid); await GiftCodeDetailModel.generateMany(giftCode, count, ctx.user?.uid);
return ctx.service.utils.resResult(STATUS.SUCCESS, giftCode); return ctx.service.utils.resResult(STATUS.SUCCESS, giftCode);
} }
@@ -571,7 +571,7 @@ export default class GMUsers extends Service {
let giftCode = await GiftCode.findByGiftId(id); let giftCode = await GiftCode.findByGiftId(id);
if(!giftCode) return ctx.service.utils.resResult(STATUS.WRONG_PARMS); if(!giftCode) return ctx.service.utils.resResult(STATUS.WRONG_PARMS);
let giftCodeDetails = await GiftCodeDetail.findAllCodeByGiftId(giftCode.id); let giftCodeDetails = await GiftCodeDetailModel.findAllCodeByGiftId(giftCode.id);
if(fileType == 'txt') { if(fileType == 'txt') {
let codes: string[] = []; let codes: string[] = [];
@@ -606,8 +606,8 @@ export default class GMUsers extends Service {
public async getGiftCodeDetailList(page: number, pageSize: number, sortField: string, sortOrder: string, form: SearchGiftCodeDetailParam = {}) { public async getGiftCodeDetailList(page: number, pageSize: number, sortField: string, sortOrder: string, form: SearchGiftCodeDetailParam = {}) {
const { ctx } = this; const { ctx } = this;
const list = await GiftCodeDetail.findByCondition(page, pageSize, sortField, sortOrder, form); const list = await GiftCodeDetailModel.findByCondition(page, pageSize, sortField, sortOrder, form);
const total = await GiftCodeDetail.countByCondition( form ) const total = await GiftCodeDetailModel.countByCondition( form )
return ctx.service.utils.resResult(STATUS.SUCCESS, { return ctx.service.utils.resResult(STATUS.SUCCESS, {
list: list.map(cur => ({...cur, env: ctx.app.config.realEnv })), total list: list.map(cur => ({...cur, env: ctx.app.config.realEnv })), total
}); });

19
shared/db/GiftCodeDetail.ts
View File

@@ -1,5 +1,5 @@
import BaseModel from './BaseModel'; import BaseModel from './BaseModel';
import { index, getModelForClass, prop, DocumentType, modelOptions, mongoose, ReturnModelType } from '@typegoose/typegoose'; import { index, getModelForClass, prop, DocumentType, modelOptions } from '@typegoose/typegoose';
import { GIFT_GENERATE_TYPE } from '../consts'; import { GIFT_GENERATE_TYPE } from '../consts';
import { GiftCodeModel, GiftCodeType } from './GiftCode'; import { GiftCodeModel, GiftCodeType } from './GiftCode';
import { nowSeconds } from '../pubUtils/timeUtil'; import { nowSeconds } from '../pubUtils/timeUtil';
@@ -55,17 +55,17 @@ export default class GiftCodeDetail extends BaseModel {
// 根据code // 根据code
public static async findByCode(code: string) { public static async findByCode(code: string) {
let result: GiftCodeDetailType = await GiftCodeDetailROModel.findOne({ code }).lean(true); let result: GiftCodeDetailType = await GiftCodeDetailModel.findOne({ code }).lean(true);
return result; return result;
} }
public static async checkHasUsed(roleId: string, id: number) { public static async checkHasUsed(roleId: string, id: number) {
let result = await GiftCodeDetailROModel.exists({ giftId: id, 'record.roleId': roleId }); let result = await GiftCodeDetailModel.exists({ giftId: id, 'record.roleId': roleId });
return result; return result;
} }
public static async checkOrderHasUsed(id: number, orderId: string) { public static async checkOrderHasUsed(id: number, orderId: string) {
let result = await GiftCodeDetailROModel.exists({ giftId: id, 'record.orderId': orderId }); let result = await GiftCodeDetailModel.exists({ giftId: id, 'record.orderId': orderId });
return result; return result;
} }
@@ -120,7 +120,7 @@ export default class GiftCodeDetail extends BaseModel {
sort[sortField] = -1; sort[sortField] = -1;
} }
} }
const result: GiftCodeDetailType[] = await GiftCodeDetailROModel.find(searchObj, { _id: 0 }).limit(pageSize).skip((page - 1) * pageSize).sort(sort).lean({ getters: true, virtuals: true }); const result: GiftCodeDetailType[] = await GiftCodeDetailModel.find(searchObj, { _id: 0 }).limit(pageSize).skip((page - 1) * pageSize).sort(sort).lean({ getters: true, virtuals: true });
return result; return result;
} }
@@ -128,7 +128,7 @@ export default class GiftCodeDetail extends BaseModel {
public static async countByCondition(form: SearchGiftCodeDetailParam = {}) { public static async countByCondition(form: SearchGiftCodeDetailParam = {}) {
let searchObj = this.getSearchObj(form); let searchObj = this.getSearchObj(form);
const result = await GiftCodeDetailROModel.count(searchObj); const result = await GiftCodeDetailModel.count(searchObj);
return result; return result;
} }
@@ -136,12 +136,5 @@ export default class GiftCodeDetail extends BaseModel {
export const GiftCodeDetailModel = getModelForClass(GiftCodeDetail); export const GiftCodeDetailModel = getModelForClass(GiftCodeDetail);
export let GiftCodeDetailROModel: ReturnModelType<typeof GiftCodeDetail, {}>;
export function loadGiftCodeDetailROModel(connect: mongoose.Connection) {
GiftCodeDetailROModel = getModelForClass(GiftCodeDetail, {
existingConnection: connect
});
}
export interface GiftCodeDetailType extends Pick<DocumentType<GiftCodeDetail>, keyof GiftCodeDetail> { } export interface GiftCodeDetailType extends Pick<DocumentType<GiftCodeDetail>, keyof GiftCodeDetail> { }
export type GiftCodeDetailParam = Partial<GiftCodeDetailType>; export type GiftCodeDetailParam = Partial<GiftCodeDetailType>;

2
shared/db/index.ts
View File

@@ -20,7 +20,6 @@ import { loadItemROModel } from "./Item";
import { loadUserGachaRecROModel } from "./UserGachaRec"; import { loadUserGachaRecROModel } from "./UserGachaRec";
import { loadUserGachaROModel } from "./UserGacha"; import { loadUserGachaROModel } from "./UserGacha";
import { loadGiftCodeROModel } from "./GiftCode"; import { loadGiftCodeROModel } from "./GiftCode";
import { loadGiftCodeDetailROModel } from "./GiftCodeDetail";
export function loadGmDb(connect: mongoose.Connection) { export function loadGmDb(connect: mongoose.Connection) {
// console.log('************') // console.log('************')
@@ -52,5 +51,4 @@ export function loadRODb(connect: mongoose.Connection) {
loadUserGachaRecROModel(connect); loadUserGachaRecROModel(connect);
loadUserGachaROModel(connect); loadUserGachaROModel(connect);
loadGiftCodeROModel(connect); loadGiftCodeROModel(connect);
loadGiftCodeDetailROModel(connect);
} }

8
web-server/app/service/Sdk.ts
View File

@@ -16,7 +16,7 @@ import { ServerlistModel } from '@db/Serverlist';
import moment = require('moment'); import moment = require('moment');
import { RegionModel } from '@db/Region'; import { RegionModel } from '@db/Region';
import { ActivityPublicAccountCodeModel } from '@db/ActivityPublicAccountCode'; import { ActivityPublicAccountCodeModel } from '@db/ActivityPublicAccountCode';
import GiftCodeDetail from '@db/GiftCodeDetail'; import { GiftCodeDetailModel } from '@db/GiftCodeDetail';
import GiftCode from '@db/GiftCode'; import GiftCode from '@db/GiftCode';
/** /**
@@ -446,7 +446,7 @@ export default class Sdk extends Service {
} else { } else {
let giftCodeDetail = await GiftCodeDetail.findByCode(params.gift_id); let giftCodeDetail = await GiftCodeDetailModel.findByCode(params.gift_id);
if(!giftCodeDetail) { if(!giftCodeDetail) {
return resResult(SDK_37_ACTIVITY_CODE.GIFT_NOT_FOUND); return resResult(SDK_37_ACTIVITY_CODE.GIFT_NOT_FOUND);
} }
@@ -469,12 +469,12 @@ export default class Sdk extends Service {
if(!role) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND); if(!role) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND);
if(params.role_id && role.roleId != params.role_id) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND); if(params.role_id && role.roleId != params.role_id) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND);
let checkHasUse = await GiftCodeDetail.checkOrderHasUsed(giftCodeDetail.giftId, params.order_id); let checkHasUse = await GiftCodeDetailModel.checkOrderHasUsed(giftCodeDetail.giftId, params.order_id);
if(checkHasUse) { if(checkHasUse) {
return resResult(SDK_37_ACTIVITY_CODE.ORDER_DUPLICATE); return resResult(SDK_37_ACTIVITY_CODE.ORDER_DUPLICATE);
} }
await GiftCodeDetail.increaseUsedNum(giftCodeDetail.code, role.roleId, role.roleName, role.serverId, params.order_id); await GiftCodeDetailModel.increaseUsedNum(giftCodeDetail.code, role.roleId, role.roleName, role.serverId, params.order_id);
await GiftCode.increaseUsedNum(giftCode.id); await GiftCode.increaseUsedNum(giftCode.id);
await ctx.service.utils.pushGiftCodeChannel(role.roleId, giftCode.id); await ctx.service.utils.pushGiftCodeChannel(role.roleId, giftCode.id);