更新至nonebot-rc1

models/bag_user.py

@@ -2,6 +2,7 @@ from services.db_context import db
 from typing import Dict
 from typing import Optional, List
 from services.log import logger
+from .goods_info import GoodsInfo
 
 
 class BagUser(db.Model):
@@ -62,17 +63,24 @@ class BagUser(db.Model):
             return 100
 
     @classmethod
-    async def get_property(cls, user_qq: int, group_id: int) -> Dict[str, int]:
+    async def get_property(cls, user_qq: int, group_id: int, only_active: bool = False) -> Dict[str, int]:
         """
         说明:
             获取当前道具
         参数:
             :param user_qq: qq号
             :param group_id: 所在群号
+            :param only_active: 仅仅获取主动使用的道具
         """
         query = cls.query.where((cls.user_qq == user_qq) & (cls.group_id == group_id))
         user = await query.gino.first()
         if user:
+            if only_active and user.property:
+                data = {}
+                name_list = [x.goods_name for x in await GoodsInfo.get_all_goods() if not x.is_passive]
+                for key in [x for x in user.property.keys() if x in name_list]:
+                    data[key] = user.property[key]
+                return data
             return user.property
         else:
             await cls.create(

models/goods_info.py

@@ -16,6 +16,8 @@ class GoodsInfo(db.Model):
     daily_purchase_limit = db.Column(
         db.JSON(), nullable=False, default={}
     )  # 每日购买限制数据存储
+    is_passive = db.Column(db.Boolean(), nullable=False, default=0)  # 是否为被动
+    icon = db.Column(db.String(), nullable=False, default=0)  # 图标
 
     _idx1 = db.Index("goods_group_users_idx1", "goods_name", unique=True)
 
@@ -28,6 +30,8 @@ class GoodsInfo(db.Model):
             goods_discount: float = 1,
             goods_limit_time: int = 0,
             daily_limit: int = 0,
+            is_passive: bool = False,
+            icon: Optional[str] = None,
     ) -> bool:
         """
         说明:
@@ -39,6 +43,8 @@ class GoodsInfo(db.Model):
             :param goods_discount: 商品折扣
             :param goods_limit_time: 商品限时
             :param daily_limit: 每日购买限制
+            :param is_passive: 是否为被动道具
+            :param icon: 图标
         """
         try:
             if not await cls.get_goods_info(goods_name):
@@ -49,10 +55,12 @@ class GoodsInfo(db.Model):
                     goods_discount=goods_discount,
                     goods_limit_time=goods_limit_time,
                     daily_limit=daily_limit,
+                    is_passive=is_passive,
+                    icon=icon
                 )
                 return True
         except Exception as e:
-            logger.error(f"GoodsInfo add_goods 发生错误 {type(e)}：{e}")
+            logger.error(f"GoodsInfo add_goods {goods_name} 发生错误 {type(e)}：{e}")
         return False
 
     @classmethod
@@ -81,7 +89,9 @@ class GoodsInfo(db.Model):
             goods_description: Optional[str] = None,
             goods_discount: Optional[float] = None,
             goods_limit_time: Optional[int] = None,
-            daily_limit: Optional[int] = None
+            daily_limit: Optional[int] = None,
+            is_passive: Optional[bool] = None,
+            icon: Optional[str] = None,
     ) -> bool:
         """
         说明:
@@ -93,6 +103,8 @@ class GoodsInfo(db.Model):
             :param goods_discount: 商品折扣
             :param goods_limit_time: 商品限时时间
             :param daily_limit: 每日次数限制
+            :param is_passive: 是否为被动
+            :param icon: 图标
         """
         try:
             query = (
@@ -108,6 +120,8 @@ class GoodsInfo(db.Model):
                 goods_discount=goods_discount or query.goods_discount,
                 goods_limit_time=goods_limit_time if goods_limit_time is not None else query.goods_limit_time,
                 daily_limit=daily_limit if daily_limit is not None else query.daily_limit,
+                is_passive=is_passive if is_passive is not None else query.is_passive,
+                icon=icon or query.icon
             ).apply()
             return True
         except Exception as e:

models/shop_log.py

@@ -0,0 +1,59 @@
+from datetime import datetime
+
+from services.db_context import db
+
+
+class ShopLog(db.Model):
+    __tablename__ = "shop_log"
+    id = db.Column(db.Integer(), primary_key=True)
+    user_qq = db.Column(db.BigInteger(), nullable=False)
+    group_id = db.Column(db.BigInteger(), nullable=False)
+    type = db.Column(db.Integer(), nullable=False)  # 0: 购买，1: 使用
+    goods_name = db.Column(db.String(), default=100)
+    spend_gold = db.Column(db.Integer(), nullable=False)
+    num = db.Column(db.Integer(), nullable=False)
+    create_time = db.Column(db.DateTime(timezone=True), nullable=False)
+
+    @classmethod
+    async def add_shop_log(
+        cls,
+        user_qq: int,
+        group_id: int,
+        type_: int,
+        goods_name: str,
+        num: int,
+        spend_gold: int = 0,
+    ):
+        """
+        说明:
+            添加商店购买或使用日志
+        参数:
+            :param user_qq: qq号
+            :param group_id: 所在群号
+            :param type_: 类型
+            :param goods_name: 商品名称
+            :param num: 数量
+            :param spend_gold: 花费金币
+        """
+        await cls.create(
+            user_qq=user_qq,
+            group_id=group_id,
+            type=type_,
+            goods_name=goods_name,
+            num=num,
+            spend_gold=spend_gold,
+            create_time=datetime.now(),
+        )
+
+    @classmethod
+    async def get_user_log(cls, user_qq: int, group_id: int) -> "ShopLog":
+        """
+        说明:
+            获取用户日志
+        参数:
+            :param user_qq: qq号
+            :param group_id: 所在群号
+        """
+        return await cls.query.where(
+            (cls.user_qq == user_qq) & (cls.group_qq == group_id)
+        ).first()