报名表单

backend/community/serializers.py

@@ -1,6 +1,6 @@
 from rest_framework import serializers
 from .models import Activity, ActivitySignup, Topic, Reply, TopicMedia, Announcement
-from shop.serializers import WeChatUserSerializer, ESP32ConfigSerializer, ServiceSerializer, VCCourseSerializer
+from shop.serializers import WeChatUserSerializer, ESP32ConfigSerializer, ServiceSerializer, VCCourseSerializer, OrderSerializer
 from .utils import get_current_wechat_user
 
 class ActivitySerializer(serializers.ModelSerializer):
@@ -47,10 +47,11 @@ class ActivitySerializer(serializers.ModelSerializer):
 
 class ActivitySignupSerializer(serializers.ModelSerializer):
     activity_info = serializers.SerializerMethodField()
+    order = OrderSerializer(read_only=True)
 
     class Meta:
         model = ActivitySignup
-        fields = ['id', 'activity', 'activity_info', 'user', 'signup_time', 'status', 'signup_info']
+        fields = ['id', 'activity', 'activity_info', 'user', 'signup_time', 'status', 'signup_info', 'order']
         read_only_fields = ['signup_time', 'status', 'user']
 
     def get_activity_info(self, obj):

backend/config/settings.py

@@ -100,8 +100,8 @@ DATABASES = {
 }
 
 # 从环境变量获取数据库配置 (Docker 环境会自动注入这些变量)
-DB_HOST = os.environ.get('DB_HOST', '121.43.104.161')
-# DB_HOST = os.environ.get('DB_HOST', '6.6.6.66')
+# DB_HOST = os.environ.get('DB_HOST', '121.43.104.161')
+DB_HOST = os.environ.get('DB_HOST', '6.6.6.66')
 if DB_HOST:
     DATABASES['default'] = {
         'ENGINE': 'django.db.backends.postgresql',
@@ -109,8 +109,8 @@ if DB_HOST:
         'USER': os.environ.get('DB_USER', 'market'),
         'PASSWORD': os.environ.get('DB_PASSWORD', '123market'),
         'HOST': DB_HOST,
-        'PORT': os.environ.get('DB_PORT', '6433'),
-        #'PORT': os.environ.get('DB_PORT', '5432'),
+        #'PORT': os.environ.get('DB_PORT', '6433'),
+        'PORT': os.environ.get('DB_PORT', '5432'),
     }
 
 

backend/shop/serializers.py

@@ -207,6 +207,7 @@ class OrderSerializer(serializers.ModelSerializer):
     """
     config_name = serializers.CharField(source='config.name', read_only=True)
     course_title = serializers.CharField(source='course.title', read_only=True)
+    activity_title = serializers.CharField(source='activity.title', read_only=True)
     config_image = serializers.SerializerMethodField()
     salesperson_name = serializers.CharField(source='salesperson.name', read_only=True)
     salesperson_code = serializers.CharField(source='salesperson.code', read_only=True)
@@ -215,7 +216,7 @@ class OrderSerializer(serializers.ModelSerializer):
     
     class Meta:
         model = Order
-        fields = ['id', 'config', 'config_name', 'config_image', 'course', 'course_title', 'quantity', 'total_price', 'status', 'created_at', 'updated_at', 'wechat_trade_no', 
+        fields = ['id', 'config', 'config_name', 'config_image', 'course', 'course_title', 'activity', 'activity_title', 'quantity', 'total_price', 'status', 'created_at', 'updated_at', 'wechat_trade_no', 
                   'customer_name', 'phone_number', 'shipping_address', 'ref_code', 'salesperson_name', 'salesperson_code', 'courier_name', 'tracking_number']
         read_only_fields = ['total_price', 'status', 'wechat_trade_no', 'created_at', 'updated_at']
         extra_kwargs = {