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

Revert "✨ feat(db): 修改role表数据库操作方式"

Browse Source 
This reverts commit e39af3649288cc5802739cfe862c818fe56e194e.
This commit is contained in:
luying
2023-05-22 19:43:21 +08:00
parent 2d45b2c66c
commit 7bc9e1fe49
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game-server/app/services/shopService.ts
+4 -4
View File
@@ -7,7 +7,7 @@ import { getRoleCreateTime, getServerCreateTime } from "./redisService";
import { decodeArrayListStr } from "../pubUtils/util";
import { UserShopTypeModel, UserShopTypeType } from "../db/UserShopType";
import { GuildModel } from "../db/Guild";
import Role from "../db/Role";
import { RoleModel } from "../db/Role";
import { DicShop } from "../pubUtils/dictionary/DicShop";
import { BackendSession, pinus } from "pinus";
import { ActivityModelType } from "../db/Activity";
@@ -132,7 +132,7 @@ export async function checkShopInPurchase(session: BackendSession, activityId: n
export async function checkShopCanBuyInOrder(roleId: string, serverId: number, activity: ActivityModelType, productID: string) {
let seasonNum = pinus.app.get('pvpSeasonNum');
let role = await Role.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let role = await RoleModel.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let { createTime, guildCode, vipStartTime } = role;
let serverTime = await getServerCreateTime(serverId);
let shopData = new ShopData(activity, createTime, serverTime);
@@ -157,7 +157,7 @@ export async function checkShopItemCanBuy(activityId: number, shopItemId: number
if(!myGuild || myGuild.lv < dicShopItem.guildLvLimit) return STATUS.GUILD_LV_LIMIT;
}
if(dicShopItem.lvLimit) {
let role = await Role.findByRoleId(roleId, 'lv');
let role = await RoleModel.findByRoleId(roleId, 'lv');
if(role.lv < dicShopItem.lvLimit) {
return STATUS.LV_LIMIT;
}
@@ -203,7 +203,7 @@ export async function checkShopItemCanBuy(activityId: number, shopItemId: number
if (activityData.type !== ACTIVITY_TYPE.SHOP) {
return STATUS.ACTIVITY_TYPE_ERROR;
}
let role = await Role.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let role = await RoleModel.findByRoleId(roleId, 'guildCode createTime vipStartTime');
let { createTime, guildCode, vipStartTime } = role;
let serverTime = await getServerCreateTime(serverId);
let shopData = new ShopData(activityData, createTime, serverTime);