报名表单

backend/community/views.py

@@ -89,14 +89,19 @@ class ActivityViewSet(viewsets.ReadOnlyModelViewSet):
                 order = pending_order
                 # Update info if needed? Maybe not.
             else:
+                # 优先从报名信息获取联系方式
+                contact_name = signup_info.get('name') or signup_info.get('participant_name') or user.nickname or 'Activity User'
+                contact_phone = signup_info.get('phone') or user.phone_number or ''
+                
                 order = Order.objects.create(
                     wechat_user=user,
                     activity=activity,
                     total_price=activity.price,
                     status='pending',
                     quantity=1,
-                    customer_name=signup_info.get('name') or user.nickname or 'Activity User',
-                    phone_number=signup_info.get('phone') or user.phone_number or '',
+                    customer_name=contact_name,
+                    phone_number=contact_phone,
+                    shipping_address=activity.location or '线下活动', # 使用活动地点作为发货地址
                 )
 
             # Generate Pay Code
@@ -109,7 +114,7 @@ class ActivityViewSet(viewsets.ReadOnlyModelViewSet):
                 return Response({'error': f'支付配置错误: {error_msg}'}, status=500)
                 
             code, message = wxpay.pay(
-                description=f"报名: {activity.title}",
+                description=f"报名活动: {activity.title}",
                 out_trade_no=out_trade_no,
                 amount={
                     'total': int(activity.price * 100),