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

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

Browse Source
This commit is contained in:
liangtongchuan
2023-05-06 15:48:16 +08:00
parent 2ff9f8c5f1
commit e65efa4192
79 changed files with 423 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ import { RedisClient } from 'redis';
import { checkParamPrice, get37GetServerMd5Sign, get37Md5SignA, get37Md5SignB, getChannelId, getRedisSubChannel, md5 } from '../pubUtils/sdkUtil';
import { UserOrderModel } from '@db/UserOrder';
import { nowSeconds } from 'app/pubUtils/timeUtil';
import { RoleModel } from '@db/Role';
import Role from '@db/Role';
import { gameData } from 'app/pubUtils/data';
import { resResult } from 'app/pubUtils/util';
import { UserModel } from '@db/User';
@@ -62,7 +62,7 @@ export default class Sdk extends Service {
}
ctx.service.utils.log('DEBUG', `[${ctx.request.url}] [${ctx.logcode}] pay37Callback check money ok ${order.price} ${params.money}`);
let role = await RoleModel.findByRoleId(order.roleId);
let role = await Role.findByRoleId(order.roleId);
if(!role) {
return ctx.service.utils.resResult(PAY_37_CALLBACK_CODE.ROLE_NOT_FOUND, '');
}
@@ -121,7 +121,7 @@ export default class Sdk extends Service {
// }
// console.log('*****pay37Callback check money ok', order.price, params.money)
// let role = await RoleModel.findByRoleId(order.roleId);
// let role = await Role.findByRoleId(order.roleId);
// if(!role) {
// return ctx.service.utils.resResult(PAY_IOS_37_CALLBACK_CODE.ROLE_NOT_FOUND, '');
// }
@@ -176,7 +176,7 @@ export default class Sdk extends Service {
}
console.log('*****refundIOSCallback check order status ok', params.money, typeof params.money)
let role = await RoleModel.findByRoleId(order.roleId);
let role = await Role.findByRoleId(order.roleId);
if(!role) {
return ctx.service.utils.resResult(SDK_37_REFUND_CODE.ROLE_NOT_FOUND, '');
}
@@ -249,7 +249,7 @@ export default class Sdk extends Service {
return SDK_37_TREAT_CODE.SUCCESS.code;
}
let role = await RoleModel.findByUidAndSetMark(user.uid, params.sid);
let role = await Role.findByUidAndSetMark(user.uid, params.sid);
if(!role) {
console.error('用户名违规处理, 未找到玩家角色', user.uid, params.sid);
return SDK_37_TREAT_CODE.SUCCESS.code;
@@ -307,7 +307,7 @@ export default class Sdk extends Service {
let user = await UserModel.findUserByChannel(channelId);
if(!user) return resResult(SDK_37_TREAT_CODE.USER_NOT_FOUND);
let role = await RoleModel.findByUid(user.uid, params.sid);
let role = await Role.findByUid(user.uid, params.sid);
if(!role) return resResult(SDK_37_TREAT_CODE.ROLE_NOT_FOUND);
let userGuild = await UserGuildModel.getMyGuild(role.roleId);
@@ -465,7 +465,7 @@ export default class Sdk extends Service {
return resResult(SDK_37_ACTIVITY_CODE.GIFT_CHANNEL_ERR);
}
let role = await RoleModel.findByUid(user.uid, params.server_id);
let role = await Role.findByUid(user.uid, params.server_id);
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);
@@ -514,7 +514,7 @@ export default class Sdk extends Service {
let server = await ServerlistModel.findByServerId(params.server_id);
if(!server) return resResult(SDK_37_ACTIVITY_CODE.SERVER_NOT_FOUND);
let role = await RoleModel.findByUid(user.uid, params.server_id, 'roleId roleName lv createTime serverId');
let role = await Role.findByUid(user.uid, params.server_id, 'roleId roleName lv createTime serverId');
if(!role) return resResult(SDK_37_ACTIVITY_CODE.ROLE_NOT_FOUND);
return resResult(SDK_37_ACTIVITY_CODE.SUCCESS, [{
id: role.roleId,
@@ -559,7 +559,7 @@ export default class Sdk extends Service {
let redisClient: RedisClient = this.ctx.app.context.redisClient;
let servers = await redisClient.hgetallAsync(REDIS_KEY.SERVER);
let roles = await RoleModel.findAllByUid(user.uid);
let roles = await Role.findAllByUid(user.uid);
let result = roles
.filter(role => !role.closeTime || role.closeTime > nowSeconds())
.map(role => ({