排序规则修改

docker-compose.prod.yml

@@ -31,7 +31,7 @@ services:
     container_name: match-vote-nextjs-nginx-1
     image: nginx:alpine
     ports:
-      - "8081:80"
+      - "8080:80"
 
     volumes:
       - ./nginx:/etc/nginx/conf.d

src/app/api/match/route.js

@@ -18,8 +18,6 @@ export async function GET(request) {
     const action = searchParams.get("action");
     const type = searchParams.get("type");
 
-    console.log("type", type);
-
     const current = parseInt(searchParams.get("current")) || 1;
     const pageSize = parseInt(searchParams.get("pageSize")) || 10;
 
@@ -164,7 +162,7 @@ export async function GET(request) {
           {
             $sort: {
               date: -1,
-              time: 1
+              time: -1
             }
           },
           // 6. 跳过一定数量的文档，用于分页

src/app/api/prediction/route.js

@@ -1,8 +1,12 @@
 import dbConnect from "../../lib/dbConnect";
 import Prediction from "../../models/Prediction";
+import Match from "../../models/Match";
+import User from "../../models/User";
 import { NextResponse } from "next/server";
 import { setCORSHeaders, handleError } from "../../lib/apiUtils";
 import { withAuth } from "../../middleware/authMiddleware";
+import mongoose from "mongoose";
+
 
 export const GET = withAuth(async (request) => {
   await dbConnect();
@@ -13,176 +17,272 @@ export const GET = withAuth(async (request) => {
     const pageSize = parseInt(searchParams.get("pageSize") || "10");
     const homeTeam = searchParams.get("homeTeam");
     const awayTeam = searchParams.get("awayTeam");
-    const username = searchParams.get("username");
+    const userId = searchParams.get("userId");
     const type = searchParams.get("type"); // 新增type参数来筛选运动类型
+    const action = searchParams.get("action"); // 新增type参数来筛选运动类型
+    const matchIds = searchParams.get("matchIds"); // 新增type参数来筛选运动类型
+
+    if (action == 'app') {
+      // 构建基础查询条件
+      let matchStage = {};
+      if (userId) {
+        matchStage.user = new mongoose.Types.ObjectId(userId);
+      }
+      if (matchIds) {
+        const matchIdsArray = matchIds.split(",").map((id) => new mongoose.Types.ObjectId(id.trim()));
+        matchStage.match = { $in: matchIdsArray };
+      }
 
-    let matchStage = {};
-
-    // 处理基础筛选条件
-    if (username) {
-      matchStage.username = { $regex: username, $options: "i" };
-    }
+      const predictions = await Prediction.find(matchStage).lean();
 
-    if (type) {
-      matchStage.type = type;
-    }
+      // 如果没有匹配的预测记录，直接返回空数组
+      if (!predictions.length) {
+        const response = NextResponse.json({
+          success: true,
+          total: 0,
+          data: [],
+        });
 
-    // 处理其他搜索参数
-    for (const [key, value] of searchParams.entries()) {
-      if (
-        ["current", "pageSize", "homeTeam", "awayTeam", "username", "type"].includes(key)
-      )
-        continue;
-
-      switch (key) {
-        case "user":
-          try {
-            matchStage[key] = new mongoose.Types.ObjectId(value);
-          } catch (error) {
-            console.error(`Invalid ObjectId for user: ${value}`);
-          }
-          break;
-        // 足球预测筛选
-        case "whoWillWin":
-          matchStage["football.whoWillWin.prediction"] = value;
-          break;
-        case "firstTeamToScore":
-          matchStage["football.firstTeamToScore.prediction"] = value;
-          break;
-        case "totalGoals":
-          matchStage["football.totalGoals.prediction"] = parseInt(value);
-          break;
-        // 篮球预测筛选
-        case "spread":
-          matchStage["basketball.spread.prediction"] = value;
-          break;
-        case "totalPoints":
-          matchStage["basketball.totalPoints.prediction"] = value;
-          break;
-        default:
-          matchStage[key] = { $regex: value, $options: "i" };
+        return setCORSHeaders(response);
       }
-    }
 
-    let pipeline = [
-      {
-        $lookup: {
-          from: "users",
-          localField: "user",
-          foreignField: "_id",
-          as: "userInfo",
-        },
-      },
-      { $unwind: { path: "$userInfo", preserveNullAndEmptyArrays: true } },
-      {
-        $addFields: {
-          username: "$userInfo.username",
-        },
-      },
-      { $match: matchStage },
-      {
-        $lookup: {
-          from: "matches",
-          localField: "match",
-          foreignField: "_id",
-          as: "matchDetails",
-        },
-      },
-      { $unwind: { path: "$matchDetails", preserveNullAndEmptyArrays: true } },
-      {
-        $addFields: {
-          matchTime: {
-            $concat: [
-              {
-                $dateToString: {
-                  format: "%Y-%m-%d",
-                  date: "$matchDetails.date",
-                },
-              },
-              " ",
-              { $ifNull: ["$matchDetails.time", "00:00"] },
-            ],
-          },
-        },
-      },
-      {
-        $project: {
-          userInfo: 0,
-        },
-      },
-      { $sort: { matchTime: -1 } },
-    ];
-
-    if (homeTeam) {
-      pipeline.push({
-        $match: {
-          "matchDetails.homeTeam.name": homeTeam,
-        },
-      });
-    }
-    if (awayTeam) {
-      pipeline.push({
-        $match: {
-          "matchDetails.awayTeam.name": awayTeam,
-        },
-      });
-    }
+      const matchIdsToQuery = predictions.map((prediction) => prediction.match);
+      const matches = await Match.find({ _id: { $in: matchIdsToQuery } }).lean();
+      // 将 matches 转换为一个映射，方便快速查找
+      const matchMap = matches.reduce((map, match) => {
+        map[match._id.toString()] = match;
+        return map;
+      }, {});
+
+      // 合并结果
+      const formattedPredictions = predictions.map((prediction) => {
+        const matchDetails = matchMap[prediction.match.toString()] || {};
 
+        const formattedPrediction = {
+          matchId: prediction.match,
+          user: prediction.user,
+          username: prediction.username,
+          type: prediction.type,
+          ...prediction,
+          pointsEarned: prediction.pointsEarned,
+          matchTime: matchDetails.date
+            ? `${new Date(matchDetails.date).toISOString().split("T")[0]} ${matchDetails.time || "00:00"}`
+            : null,
+          homeTeam: matchDetails.homeTeam?.name || "N/A",
+          awayTeam: matchDetails.awayTeam?.name || "N/A",
+          score: "",
+        };
 
-    const countPipeline = [...pipeline, { $count: "total" }];
-    const totalResult = await Prediction.aggregate(countPipeline);
-    const totalCount = totalResult.length > 0 ? totalResult[0].total : 0;
+        // 根据运动类型添加特定信息
+        if (prediction.type === "football") {
+          formattedPrediction.score = `${matchDetails.homeTeamScore || 0}:${matchDetails.awayTeamScore || 0}`;
+        } else if (prediction.type === "basketball") {
+          formattedPrediction.score = `${matchDetails.homeTeamScore || 0}-${matchDetails.awayTeamScore || 0}`;
+        }
 
-    pipeline.push({ $skip: (current - 1) * pageSize });
-    pipeline.push({ $limit: pageSize });
+        return formattedPrediction;
+      });
+      const response = NextResponse.json({
+        success: true,
+        total: 0,
+        data: formattedPredictions,
+      });
 
-    const predictions = await Prediction.aggregate(pipeline);
+      return setCORSHeaders(response);
+    } else {
+      let matchStage = {};
+      // 处理基础筛选条件
+      if (userId) {
+        matchStage.userId = { $regex: userId, $options: "i" };
+      }
 
-    const validPredictions = [];
-    const invalidPredictionIds = [];
+      if (type) {
+        matchStage.type = type;
+      }
+      if (homeTeam) {
+        pipeline.push({
+          $match: {
+            "matchDetails.homeTeam.name": homeTeam,
+          },
+        });
+      }
+      if (awayTeam) {
+        pipeline.push({
+          $match: {
+            "matchDetails.awayTeam.name": awayTeam,
+          },
+        });
+      }
+      // 处理其他搜索参数
+      for (const [key, value] of searchParams.entries()) {
+        if (
+          ["current", "pageSize", "homeTeam", "awayTeam", "username", "type"].includes(key)
+        )
+          continue;
+
+        switch (key) {
+          case "user":
+            try {
+              matchStage[key] = new mongoose.Types.ObjectId(value);
+            } catch (error) {
+              console.error(`Invalid ObjectId for user: ${value}`);
+            }
+            break;
+          // 足球预测筛选
+          case "whoWillWin":
+            matchStage["football.whoWillWin.prediction"] = value;
+            break;
+          case "firstTeamToScore":
+            matchStage["football.firstTeamToScore.prediction"] = value;
+            break;
+          case "totalGoals":
+            matchStage["football.totalGoals.prediction"] = parseInt(value);
+            break;
+          // 篮球预测筛选
+          case "spread":
+            matchStage["basketball.spread.prediction"] = value;
+            break;
+          case "totalPoints":
+            matchStage["basketball.totalPoints.prediction"] = value;
+            break;
+          default:
+            matchStage[key] = { $regex: value, $options: "i" };
+        }
+      }
+      let basePipeline = [{ $match: matchStage }];
+
+      const countPipeline = [...basePipeline, { $count: "total" }];
+      const totalResult = await Prediction.aggregate(countPipeline);
+      const totalCount = totalResult.length > 0 ? totalResult[0].total : 0;
+
+      let pipeline = [
+        { $match: matchStage },
+        // {
+        //   $lookup: {
+        //     from: "matches",
+        //     localField: "match",
+        //     foreignField: "_id",
+        //     as: "matchDetails",
+        //   },
+        // },
+        // { $unwind: { path: "$matchDetails", preserveNullAndEmptyArrays: true } },
+        // {
+        //   $addFields: {
+        //     matchTime: {
+        //       $concat: [
+        //         {
+        //           $dateToString: {
+        //             format: "%Y-%m-%d",
+        //             date: "$matchDetails.date",
+        //           },
+        //         },
+        //         " ",
+        //         { $ifNull: ["$matchDetails.time", "00:00"] },
+        //       ],
+        //     },
+        //   },
+        // },
+        // {
+        //   $project: {
+        //     userInfo: 0,
+        //   },
+        // },
+        { $sort: { createdAt: -1 } },
+      ];
+
+      pipeline.push({ $skip: (current - 1) * pageSize });
+      pipeline.push({ $limit: pageSize });
+
+      const predictions = await Prediction.aggregate(pipeline);
+
+      // predictions.forEach((prediction) => {
+      //   if (prediction.matchDetails) {
+      //     const formattedPrediction = {
+      //       matchId: prediction.matchDetails._id,
+      //       ...prediction,
+      //       match: undefined,
+      //       matchDetails: undefined,
+      //       homeTeam: prediction.matchDetails.homeTeam.name,
+      //       awayTeam: prediction.matchDetails.awayTeam.name
+      //     };
+
+      //     // 根据运动类型添加特定信息
+      //     if (prediction.type === "football") {
+      //       formattedPrediction.score = `${prediction.matchDetails.homeTeamScore}:${prediction.matchDetails.awayTeamScore}`;
+      //     } else if (prediction.type === "basketball") {
+      //       formattedPrediction.score = `${prediction.matchDetails.homeTeamScore}-${prediction.matchDetails.awayTeamScore}`;
+      //     }
+
+      //     validPredictions.push(formattedPrediction);
+      //   } else {
+      //     invalidPredictionIds.push(prediction._id);
+      //   }
+      // });
+
+      const matchIdsToQuery = predictions.map((prediction) => prediction.match);
+      const matches = await Match.find({ _id: { $in: matchIdsToQuery } }).lean();
+      // 将 matches 转换为一个映射，方便快速查找
+      const matchMap = matches.reduce((map, match) => {
+        map[match._id.toString()] = match;
+        return map;
+      }, {});
+
+      const validPredictions = [];
+      const invalidPredictionIds = [];
+
+      // 合并结果
+      predictions.map((prediction) => {
+        const matchDetails = matchMap[prediction.match.toString()] || {};
 
-    predictions.forEach((prediction) => {
-      if (prediction.matchDetails) {
         const formattedPrediction = {
-          matchId: prediction.matchDetails._id,
+          matchId: prediction.match,
+          user: prediction.user,
+          username: prediction.username,
+          type: prediction.type,
           ...prediction,
-          match: undefined,
-          matchDetails: undefined,
-          homeTeam: prediction.matchDetails.homeTeam.name,
-          awayTeam: prediction.matchDetails.awayTeam.name
+          pointsEarned: prediction.pointsEarned,
+          matchTime: matchDetails.date
+            ? `${new Date(matchDetails.date).toISOString().split("T")[0]} ${matchDetails.time || "00:00"}`
+            : null,
+          homeTeam: matchDetails.homeTeam?.name || "N/A",
+          awayTeam: matchDetails.awayTeam?.name || "N/A",
+          score: "",
         };
 
         // 根据运动类型添加特定信息
         if (prediction.type === "football") {
-          formattedPrediction.score = `${prediction.matchDetails.homeTeamScore}:${prediction.matchDetails.awayTeamScore}`;
+          formattedPrediction.score = `${matchDetails.homeTeamScore || 0}:${matchDetails.awayTeamScore || 0}`;
         } else if (prediction.type === "basketball") {
-          formattedPrediction.score = `${prediction.matchDetails.homeTeamScore}-${prediction.matchDetails.awayTeamScore}`;
+          formattedPrediction.score = `${matchDetails.homeTeamScore || 0}-${matchDetails.awayTeamScore || 0}`;
+        }
+        if (matchDetails) {
+          validPredictions.push(formattedPrediction);
+        } else {
+          invalidPredictionIds.push(prediction._id);
         }
+        // return formattedPrediction;
+      });
 
-        validPredictions.push(formattedPrediction);
-      } else {
-        invalidPredictionIds.push(prediction._id);
+      if (invalidPredictionIds.length > 0) {
+        const deleteResult = await Prediction.deleteMany({
+          _id: { $in: invalidPredictionIds },
+        });
+        console.log(`Deleted ${deleteResult.deletedCount} invalid predictions.`);
       }
-    });
 
-    if (invalidPredictionIds.length > 0) {
-      const deleteResult = await Prediction.deleteMany({
-        _id: { $in: invalidPredictionIds },
+      const response = NextResponse.json({
+        success: true,
+        total: totalCount - invalidPredictionIds.length,
+        data: validPredictions,
       });
-      console.log(`Deleted ${deleteResult.deletedCount} invalid predictions.`);
-    }
 
-    const response = NextResponse.json({
-      success: true,
-      total: totalCount - invalidPredictionIds.length,
-      data: validPredictions,
-    });
-
-    return setCORSHeaders(response);
+      return setCORSHeaders(response);
+    }
   } catch (error) {
     console.error("Error in GET request:", error);
     return handleError(error);
   }
+
 });
 
 export const POST = withAuth(async (request) => {
@@ -198,6 +298,16 @@ export const POST = withAuth(async (request) => {
       );
     }
 
+    // 查找用户
+    const userInfo = await User.findOne({ _id: userId });
+    if (!userInfo) {
+      response = NextResponse.json(
+        { success: false, error: "无效用户" },
+        { status: 401 }
+      );
+      return setCORSHeaders(response);
+    }
+
     if (
       !predictions ||
       !Array.isArray(predictions) ||
@@ -226,6 +336,7 @@ export const POST = withAuth(async (request) => {
 
 
       if (existingPrediction) {
+        existingPrediction.username = userInfo.username;
         // 更新预测
         if (type === "football" && football) {
           if (football.whoWillWin) {
@@ -274,6 +385,7 @@ export const POST = withAuth(async (request) => {
         // 创建新预测
         const newPrediction = new Prediction({
           user: userId,
+          username: userInfo.username,
           match: matchId,
           type,
           ...(type === "football" &&

src/app/models/Prediction.js

@@ -3,6 +3,11 @@ import mongoose from "mongoose";
 const PredictionSchema = new mongoose.Schema(
   {
     user: { type: mongoose.Schema.Types.ObjectId, ref: "User" }, // 用户ID
+    username: {
+      type: String,
+      required: true,
+      default: null,
+    },
     match: { type: mongoose.Schema.Types.ObjectId, ref: "Match" }, // 比赛ID
 
     type: {
@@ -90,6 +95,7 @@ const PredictionSchema = new mongoose.Schema(
 
 PredictionSchema.index({ "user": 1 }); // user 索引
 PredictionSchema.index({ "match": 1 }); // match 索引
+PredictionSchema.index({ "createdAt": 1 }); // createdAt 索引
 PredictionSchema.index({ user: 1, match: 1 }, { unique: true });
 
 export default mongoose.models.Prediction ||

src/app/personal-center/page.jsx

@@ -153,7 +153,6 @@ const PersonalCenter = () => {
   };
 
   const handleExchangePoints = () => {
-    console.log("兑换积分");
     router.push("/exchange-points");
   };
 

src/app/ui/FootballMatch.jsx

@@ -42,8 +42,12 @@ const FootballMatch = ({ selectedDayMatches, currentUser }) => {
   useEffect(() => {
     const fetchPredictions = async () => {
       try {
+        const matchIds = selectedDayMatches.map((match) => match._id).join(",");
+
         const res = await fetchApi(
-          `/api/prediction?username=${currentUser?.username || ""}`
+          `/api/prediction?action=app&userId=${currentUser?.id || ""}` +
+            `&matchIds=` +
+            matchIds
         );
         if (res.success) {
           setPredictions(res.data);
@@ -54,10 +58,14 @@ const FootballMatch = ({ selectedDayMatches, currentUser }) => {
         setAlert({ type: "error", message: err });
       }
     };
-    if (currentUser?.id) {
+    if (
+      selectedDayMatches &&
+      selectedDayMatches.length > 0 &&
+      currentUser?.id
+    ) {
       fetchPredictions();
     }
-  }, [currentUser]);
+  }, [currentUser, selectedDayMatches]);
 
   useEffect(() => {
     if (selectedMatchId !== null) {
@@ -181,11 +189,6 @@ const FootballMatch = ({ selectedDayMatches, currentUser }) => {
 
   // 提交预测
   const handleSubmitPredictions = async () => {
-    console.log(
-      totalGoalCountOfMatch,
-      selectedWinTeams,
-      selectedFirstTeamToScoreOfMatch
-    );
     // 格式化单个预测数据的辅助函数
     const formatPrediction = (matchId, existingPrediction = null) => {
       return {

src/app/ui/MatchPrediction.jsx

@@ -2,40 +2,53 @@
 
 import React, { useState } from "react";
 import Alert from "./components/Alert";
+import { useRouter } from "next/navigation";
 
 import MatchDays from "./MatchDays";
 
 import BasketballMatch from "./BasketballMatch";
 import FootballMatch from "./FootballMatch";
 
-const SportsTabs = ({ activeTab, onTabChange }) => {
+const SportsTabs = ({ activeTab, onTabChange, hotPushOrder }) => {
   return (
-    <div className="flex bg-blue-600 rounded-lg p-1">
-      <button
-        className={`flex-1 py-2 rounded-md transition-all duration-200 ${
-          activeTab === "football"
-            ? "bg-blue-200 text-blue-800 font-medium"
-            : "text-white hover:bg-blue-500"
-        }`}
-        onClick={() => onTabChange("football")}
+    <div>
+      {/* <button
+        type="submit"
+        className="w-full flex justify-center py-3 px-4 border border-transparent rounded-md shadow-sm text-base font-medium text-white bg-red-600 hover:bg-blue-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+        onClick={() => hotPushOrder()}
       >
-        足球赛事
-      </button>
-      <button
-        className={`flex-1 py-2 rounded-md transition-all duration-200 ${
-          activeTab === "basketball"
-            ? "bg-blue-200 text-blue-800 font-medium"
-            : "text-white hover:bg-blue-500"
-        }`}
-        onClick={() => onTabChange("basketball")}
-      >
-        篮球赛事
-      </button>
+        热门推单
+      </button> */}
+
+      <div className="flex bg-blue-600 rounded-lg p-1">
+        <button
+          className={`flex-1 py-2 rounded-md transition-all duration-200 ${
+            activeTab === "football"
+              ? "bg-blue-200 text-blue-800 font-medium"
+              : "text-white hover:bg-blue-500"
+          }`}
+          onClick={() => onTabChange("football")}
+        >
+          足球赛事
+        </button>
+        <button
+          className={`flex-1 py-2 rounded-md transition-all duration-200 ${
+            activeTab === "basketball"
+              ? "bg-blue-200 text-blue-800 font-medium"
+              : "text-white hover:bg-blue-500"
+          }`}
+          onClick={() => onTabChange("basketball")}
+        >
+          篮球赛事
+        </button>
+      </div>
     </div>
   );
 };
 
 const MatchPrediction = ({ currentUser }) => {
+  const router = useRouter();
+
   const [activeTab, setActiveTab] = useState("football");
   const [alert, setAlert] = useState(null);
 
@@ -50,9 +63,17 @@ const MatchPrediction = ({ currentUser }) => {
     }
   };
 
+  const hotPushOrder = () => {
+    router.push("/hot-push-order");
+  };
+
   return (
     <div className="bg-blue-600 text-white max-w-md mx-auto min-h-screen">
-      <SportsTabs activeTab={activeTab} onTabChange={setActiveTab} />
+      <SportsTabs
+        activeTab={activeTab}
+        onTabChange={setActiveTab}
+        hotPushOrder={hotPushOrder}
+      />
 
       <MatchDays onSelectMatch={handleMatchSelect} type={activeTab} />
 

src/app/ui/components/ActivityModal.jsx

@@ -37,8 +37,6 @@ const ActivityModal = () => {
 
   if (!isOpen || !activityContent || isLoading) return null;
 
-  console.log("activityContent", activityContent);
-
   const hasBackgroundImage = !!activityContent?.backgroundImage;
   const hasBackgroundImageLink = !!activityContent?.backgroundImageLink;