添加套餐过期时间

redis/test_user_redis.py

@@ -2,6 +2,7 @@ import json
 import random
 import string
 import uuid
+import time
 from flask import Flask, request, jsonify, session
 from redis import Redis
 
@@ -138,11 +139,11 @@ def purchase():
         return jsonify({'message': 'User not found'}), 400
 
     # 检查用户是否已经支付过当前套餐
-    if has_purchased_package(user_id, package_id):
+    if not is_package_expired(user_id) and has_purchased_package(user_id, package_id):
         return jsonify({'message': 'Package already purchased'}), 400
 
     # 检查如果用户已经支付了高级套餐，则不能支付比高级套餐更低级的基础套餐
-    if has_purchased_advanced_package(user_id) and package_id == '1':
+    if not is_package_expired(user_id) and has_purchased_advanced_package(user_id) and package_id == '1':
         return jsonify({'message': 'Cannot purchase lower level package'}), 400
     
     # 存储用户套餐信息到Redis
@@ -191,14 +192,16 @@ def get_package_by_id(package_id):
             'name': 'Package 1',
             'basic_chat_limit': 10,
             'advanced_chat_limit': 10,
-            'price': 10
+            'price': 10,
+            'expiration': 30 * 24 * 60 * 60  # 过期时间为30天（以秒为单位）
         },
         '2': {
             'package_id': '2',
             'name': 'Package 2',
             'basic_chat_limit': -1,  # -1 表示无限次
             'advanced_chat_limit': -1,
-            'price': 100
+            'price': 100,
+            'expiration': 30 * 24 * 60 * 60  # 过期时间为30天（以秒为单位）
         }
     }
 
@@ -214,6 +217,9 @@ def store_user_package(user_id, package):
                package['basic_chat_limit'])
     redis.hset(user_package_key, 'advanced_chat_limit',
                package['advanced_chat_limit'])
+    # 设置套餐过期时间
+    expiration = int(time.time()) + package['expiration']
+    redis.expireat(user_package_key, expiration)
 
 
 # 获取用户套餐信息
@@ -237,6 +243,19 @@ def has_purchased_advanced_package(user_id):
     return purchased_package_id.decode('utf-8') == '2'
 
 
+# 检查套餐是否过期
+def is_package_expired(user_id):
+    user_package_key = f'user:{user_id}:package'
+    expiration = redis.ttl(user_package_key)
+    return expiration <= 0
+
+
+# 获取套餐有效期
+def get_package_expiration(user_id):
+    user_package_key = f'user:{user_id}:package'
+    expiration = redis.ttl(user_package_key)
+    return expiration
+
 # 检查用户聊天次数是否超过限制
 def exceeded_chat_limit(user_id, package):
     user_basic_chat_key = f'user:{user_id}:basic_chat'