Merge branch 'master' of https://github.com/MoFox-Studio/MoFox_Bot

src/common/database/monthly_plan_db.py

@@ -62,11 +62,10 @@ def get_active_plans_for_month(month: str) -> List[MonthlyPlan]:
     """
     with get_db_session() as session:
         try:
-            plans = (
-                session.query(MonthlyPlan)
-                .filter(MonthlyPlan.target_month == month, MonthlyPlan.status == "active")
-                .all()
-            )
+            plans = session.query(MonthlyPlan).filter(
+                MonthlyPlan.target_month == month,
+                MonthlyPlan.status == 'active'
+            ).order_by(MonthlyPlan.created_at.desc()).all()
             return plans
         except Exception as e:
             logger.error(f"查询 {month} 的有效月度计划时发生错误: {e}")

src/common/database/sqlalchemy_models.py

@@ -51,6 +51,8 @@ class ChatStreams(Base):
     user_id = Column(get_string_field(100), nullable=False, index=True)
     user_nickname = Column(Text, nullable=False)
     user_cardname = Column(Text, nullable=True)
+    energy_value = Column(Float, nullable=True, default=5.0)
+    sleep_pressure = Column(Float, nullable=True, default=0.0)
 
     __table_args__ = (
         Index("idx_chatstreams_stream_id", "stream_id"),