活动：删除serverId相关查询

game-server/app/servers/order/handler/orderHandler.ts

@@ -9,6 +9,7 @@ import { applyOrderALI, checkOrderALI } from '../../../services/pay/aliPay';
 import { makeOrder } from '../../../services/orderService';
 import { addRechargeMoney } from '../../../services/rechargeMoneyService';
 import { ActivityModel, ActivityModelType } from '../../../db/Activity';
+import { ServerlistModel } from '../../../db/Serverlist';
 
 export default function (app: Application) {
     return new orderHandler(app);
@@ -223,7 +224,8 @@ export class orderHandler {
         let orderID = '';//平台订单号
         let sdkOrderInfo = null;//客户端需要的平台订单信息
 
-        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, productType, -1);
+        let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+        let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, productType, -1);
         if (activityArray.length === 0) {
             return resResult(STATUS.ACTIVITY_MISSING);
         }