From 4f85408fd98d89ccca74d813deb89d4cbb2728ee Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Tue, 25 Feb 2025 21:56:02 +0800
Subject: [PATCH] fix coupon bug.

---
 app/api/endpoints/coupon_activity.py | 1 +
 app/api/endpoints/wechat.py          | 6 +++---
 app/models/coupon.py                 | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/api/endpoints/coupon_activity.py b/app/api/endpoints/coupon_activity.py
index e2435b0..30b4b14 100644
--- a/app/api/endpoints/coupon_activity.py
+++ b/app/api/endpoints/coupon_activity.py
@@ -149,6 +149,7 @@ async def receive_coupons(
                         coupon_id=coupon.id,
                         coupon_name=coupon.name,
                         coupon_amount=coupon.amount,
+                        coupon_type=coupon.coupon_type,
                         expire_time=expire_time,
                         status=CouponStatus.UNUSED
                     )
diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py
index c5fb83b..db609c0 100644
--- a/app/api/endpoints/wechat.py
+++ b/app/api/endpoints/wechat.py
@@ -22,6 +22,7 @@ from app.core.point_manager import PointManager
 from app.core.point_manager import PointRecordType
 from app.core.account import AccountManager
 import logging
+from app.core.security import get_password_hash
 
 router = APIRouter()
 
@@ -52,6 +53,7 @@ async def wechat_phone_login(
         
         # 获取用户手机号
         phone_info = await wechat.get_phone_number(request.phone_code)
+
         
         if not phone_info:
             return error_response(code=400, message="获取手机号失败")
@@ -74,15 +76,13 @@ async def wechat_phone_login(
                 phone=phone,
                 user_code=user_code,
                 referral_code=request.referral_code,
+                password=get_password_hash("123456"),
                 openid=openid,  # 保存 openid
                 unionid=unionid  # 保存 unionid
             )
             db.add(user)
             db.flush()
             
-            # 发放优惠券
-            # from app.api.endpoints.user import issue_register_coupons
-            # issue_register_coupons(db, user.userid)
             
             db.commit()
             db.refresh(user)
diff --git a/app/models/coupon.py b/app/models/coupon.py
index 7a84699..9a648dd 100644
--- a/app/models/coupon.py
+++ b/app/models/coupon.py
@@ -76,7 +76,7 @@ class UserCouponInfo(BaseModel):
     coupon_amount: float
     coupon_type: CouponType
     expire_time: datetime
-    used_time: datetime
+    used_time: Optional[datetime] = None
     status: CouponStatus
     create_time: datetime