mong优化

webServer/src/channels/handlers/MiniappChannelHandler.ts

@@ -5,7 +5,6 @@ import {
   PaymentResult,
 } from "../interfaces/ChannelHandler";
 import { ChannelConfig } from "../../config/channelConfig";
-import { PaymentHelper } from "../../utils/PaymentHelper";
 import { getServerList, formatDate } from "../../utils/common";
 import { Account } from "../../config/thirdParams";
 import Msg from "../../utils/msg";

webServer/src/controller/MiniAppController.ts

@@ -1,12 +1,6 @@
 import { Context } from "koa";
-import { getServerList, formatDate } from "../utils/common";
-import { Account } from "../config/thirdParams";
-import Msg from "../utils/msg";
-import axios from "axios";
-import { getRoleInfoById } from "../mongo/mongodb";
-
-const Order = require("../model/OrderModel");
-const CryptoJS = require("crypto-js");
+import { getRoleInfoById,getGuildInfoById } from "../mongo/mongodb";
+
 const logger = require("../utils/log");
 
 // 导入小程序配置
@@ -389,7 +383,7 @@ class MiniappController {
       
       if (roleInfo) {
         // 如果找到角色信息，返回格式化的数据
-        return {
+        const data =  {
           rolename: roleInfo.name || "未知角色",
           rolelv: roleInfo.lv || 1,
           rolepwr: roleInfo.rolepwr || 0, //战力
@@ -397,6 +391,14 @@ class MiniappController {
           alliance: roleInfo.alliance || "", //帮派
           paymoney: roleInfo.topupAcount || 0 //累计充值金额
         };
+        if(roleInfo.guildId){
+        const guildInfo = await getGuildInfoById(dbName, roleInfo.guildId);
+        if (guildInfo) {
+            data.alliance = guildInfo.name;
+          }
+        }
+        return data;
+
       } else {
         // 如果没有找到角色信息，返回默认数据
         logger.warn(`未找到角色信息: ${data.roleid}`);

webServer/src/mongo/mongodb.ts

@@ -1,6 +1,6 @@
 import {mongoConfig,} from '../config/dbConfig'
 
-import {Db, MongoClient} from 'mongodb';
+import {Db, MongoClient, ObjectId} from 'mongodb';
 
 const url = `mongodb://${mongoConfig.url}:${mongoConfig.port}`;
 let db: Db | null = null;
@@ -53,5 +53,12 @@ async function getRoleInfoById(dbName: string, roleId: string) {
         return null;
     }
 }
+//查询工会信息
+async function getGuildInfoById(dbName: string, uuid :string) {
+    const database = client.db(dbName);
+    const collection = database.collection('guild');
+    const guildInfo = await collection.findOne({_id: new ObjectId(uuid)});
+    return guildInfo;
+}
 
-export { getDb, getCollection, closeConnection, getRoleInfoById, connectToMongo };
+export { getDb, getCollection, closeConnection, getRoleInfoById, connectToMongo, getGuildInfoById };

webServer/src/router/miniapp.ts

@@ -1,21 +1,21 @@
 import Router from "@koa/router";
-const MiniappController = require("../controller/MiniappController");
+const MiniAppController = require("../controller/MiniappController");
 
-const miniApprouter = new Router();
+const miniAppRouter = new Router();
 
 // 内容安全审核
-miniApprouter.post("/contentSecurityCheck", MiniappController.contentSecurityCheck);
+miniAppRouter.post("/contentSecurityCheck", MiniAppController.contentSecurityCheck);
 
 // 角色名称修改上报
-miniApprouter.post("/editUserRoleInfo", MiniappController.editUserRoleInfo);
+miniAppRouter.post("/editUserRoleInfo", MiniAppController.editUserRoleInfo);
 
 // 禁言接口
-miniApprouter.post("/forbidChat", MiniappController.forbidChat);
+miniAppRouter.post("/forbidChat", MiniAppController.forbidChat);
 
 // 解除禁言接口
-miniApprouter.post("/freeChat", MiniappController.freeChat);
+miniAppRouter.post("/freeChat", MiniAppController.freeChat);
 
 // 角色查询接口
-miniApprouter.post("/roleQuery", MiniappController.roleQuery);
+miniAppRouter.post("/roleQuery", MiniAppController.roleQuery);
 
-export default miniApprouter;
+export default miniAppRouter;