修改套餐过期时间

chatgpt-next-web/pay_package.py

@@ -2,19 +2,20 @@
 packages = [
     {
         'id': '1',
-        'title': '基础套餐（推荐）',
-        'basic_chat_limit': 10,
-        'advanced_chat_limit': 10,
-        'price': 1,  # 以分计算
-        'expiration': -1
+        'title': '尝鲜套餐',
+        'basic_chat_limit': 50,
+        'advanced_chat_limit': 0,
+        'price': 100,  # 以分计算
+        'expiration': 30 * 24 * 60 * 60  # 过期时间为30天（以秒为单位）
     },
     {
         'id': '2',
-        'title': '高级套餐',
+        'title': '无限制基础访问套餐',
         'basic_chat_limit': -1,  # -1 表示无限次
-        'advanced_chat_limit': -1,
-        'price': 100,   # 以分计算
-        'expiration': -1
+        'advanced_chat_limit': 0,
+        'price': 60000,   # 以分计算
+        'expiration': 30 * 24 * 60 * 60  # 过期时间为30天（以秒为单位）
+
     }
 ]
 

chatgpt-next-web/service.py

@@ -97,7 +97,7 @@ def register():
 
     # 清除验证码
     redis.delete(email)
-    
+
     # 注册免费赠送12次
     pick_up_free_chat_count(user_id, 12)
 
@@ -345,13 +345,27 @@ def get_user_profile():
     basic_chat_limit = int(package.get(b'basic_chat_limit', 0))
     advanced_chat_limit = int(package.get(b'advanced_chat_limit', 0))
 
+    user_package_key = f'user:{user_id}:package'
+    expiration_seconds = redis.ttl(user_package_key)
+    print("expiration_seconds = ", expiration_seconds, "is_package_expired = ", is_package_expired(user_id))
+    formatted_expiration = ""
+    if expiration_seconds > 0:
+        expiration_datetime = (
+            datetime.datetime.now()
+            + datetime.timedelta(seconds=expiration_seconds)
+        )
+        formatted_expiration = expiration_datetime.strftime('%Y-%m-%d')
+    else:
+        formatted_expiration = '已过期'
+
     return jsonify({
         'code': 0,
         'message': 'Success',
         'data': {
             'free_count': free_count,
             'basic_chat_limit': basic_chat_limit,
-            'advanced_chat_limit': advanced_chat_limit
+            'advanced_chat_limit': advanced_chat_limit,
+            'expiration': formatted_expiration
         }
     })
 
@@ -660,8 +674,8 @@ def store_user_package(user_id, package):
     redis.hset(user_package_key, 'basic_chat_limit', basic_chat_limit)
     redis.hset(user_package_key, 'advanced_chat_limit', advanced_chat_limit)
     # 设置套餐过期时间
-    # expiration = int(time.time()) + package['expiration']
-    # redis.expireat(user_package_key, expiration)
+    expiration = int(time.time()) + package['expiration']
+    redis.expireat(user_package_key, expiration)
 
 
 # 获取用户套餐信息