| 
                
               | 
              
                
               | 
              
                @@ -116,11 +116,18 @@ def activity_contribute_create(request): 
               | 
            
            
            
              | 
                116
               | 
              
                116
               | 
              
                     except UserInfo.DoesNotExist: 
               | 
            
            
            
              | 
                117
               | 
              
                117
               | 
              
                         return response(UserStatusCode.USER_NOT_FOUND) 
               | 
            
            
            
              | 
                118
               | 
              
                118
               | 
              
                  
               | 
            
            
            
              | 
                119
               | 
              
                
               | 
              
                -    MemberActivitySignupInfo.objects.update_or_create(user_id=user_id, activity_id=activity_id, defaults={
               | 
            
            
            
              | 
                120
               | 
              
                
               | 
              
                -        'title': act.title, 
               | 
            
            
            
              | 
                121
               | 
              
                
               | 
              
                -        'name': user_name, 
               | 
            
            
            
              | 
                122
               | 
              
                
               | 
              
                -        'avatar': user_avatar, 
               | 
            
            
            
              | 
                123
               | 
              
                
               | 
              
                -    }) 
               | 
            
            
            
              | 
                
               | 
              
                119
               | 
              
                +    try: 
               | 
            
            
            
              | 
                
               | 
              
                120
               | 
              
                +        signup_info = MemberActivitySignupInfo.objects.get(user_id=user_id, activity_id=activity_id, status=True) 
               | 
            
            
            
              | 
                
               | 
              
                121
               | 
              
                +        if user_name and user_avatar: 
               | 
            
            
            
              | 
                
               | 
              
                122
               | 
              
                +            signup_info.name = user_name 
               | 
            
            
            
              | 
                
               | 
              
                123
               | 
              
                +            signup_info.avatar = user_avatar 
               | 
            
            
            
              | 
                
               | 
              
                124
               | 
              
                +            signup_info.save() 
               | 
            
            
            
              | 
                
               | 
              
                125
               | 
              
                +    except MemberActivitySignupInfo.DoesNotExist: 
               | 
            
            
            
              | 
                
               | 
              
                126
               | 
              
                +        signup_info = MemberActivitySignupInfo.objects.create(user_id=user_id, activity_id=activity_id, defaults={
               | 
            
            
            
              | 
                
               | 
              
                127
               | 
              
                +            'title': act.title, 
               | 
            
            
            
              | 
                
               | 
              
                128
               | 
              
                +            'name': user_name, 
               | 
            
            
            
              | 
                
               | 
              
                129
               | 
              
                +            'avatar': user_avatar, 
               | 
            
            
            
              | 
                
               | 
              
                130
               | 
              
                +        }) 
               | 
            
            
            
              | 
                124
               | 
              
                131
               | 
              
                  
               | 
            
            
            
              | 
                125
               | 
              
                132
               | 
              
                     contribution = MemberActivityContributionInfo.objects.create( 
               | 
            
            
            
              | 
                126
               | 
              
                133
               | 
              
                         brand_id=brand_id, 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -132,8 +139,8 @@ def activity_contribute_create(request): 
               | 
            
            
            
              | 
                132
               | 
              
                139
               | 
              
                         content=content, 
               | 
            
            
            
              | 
                133
               | 
              
                140
               | 
              
                         images=images, 
               | 
            
            
            
              | 
                134
               | 
              
                141
               | 
              
                         video_url=video_url, 
               | 
            
            
            
              | 
                135
               | 
              
                
               | 
              
                -        user_name=user_name, 
               | 
            
            
            
              | 
                136
               | 
              
                
               | 
              
                -        user_avatar=user_avatar, 
               | 
            
            
            
              | 
                
               | 
              
                142
               | 
              
                +        user_name=signup_info.name, 
               | 
            
            
            
              | 
                
               | 
              
                143
               | 
              
                +        user_avatar=signup_info.final_avatar, 
               | 
            
            
            
              | 
                137
               | 
              
                144
               | 
              
                     ) 
               | 
            
            
            
              | 
                138
               | 
              
                145
               | 
              
                  
               | 
            
            
            
              | 
                139
               | 
              
                146
               | 
              
                     return response(data={
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -154,6 +161,10 @@ def activity_contribute_update(request): 
               | 
            
            
            
              | 
                154
               | 
              
                161
               | 
              
                     images = get_query_value(request, 'images', val_cast_type='listjson') 
               | 
            
            
            
              | 
                155
               | 
              
                162
               | 
              
                     video_url = request.POST.get('video_url', '')
               | 
            
            
            
              | 
                156
               | 
              
                163
               | 
              
                  
               | 
            
            
            
              | 
                
               | 
              
                164
               | 
              
                +    # 报名字段 
               | 
            
            
            
              | 
                
               | 
              
                165
               | 
              
                +    user_name = request.POST.get('user_name', '')
               | 
            
            
            
              | 
                
               | 
              
                166
               | 
              
                +    user_avatar = request.POST.get('user_avatar', '')
               | 
            
            
            
              | 
                
               | 
              
                167
               | 
              
                + 
               | 
            
            
            
              | 
                157
               | 
              
                168
               | 
              
                     # 校验用户是否存在 
               | 
            
            
            
              | 
                158
               | 
              
                169
               | 
              
                     try: 
               | 
            
            
            
              | 
                159
               | 
              
                170
               | 
              
                         UserInfo.objects.get(user_id=user_id) 
               | 
            
            
            
            
            
              | 
                
               | 
              
                
               | 
              
                @@ -162,6 +173,11 @@ def activity_contribute_update(request): 
               | 
            
            
            
              | 
                162
               | 
              
                173
               | 
              
                  
               | 
            
            
            
              | 
                163
               | 
              
                174
               | 
              
                     try: 
               | 
            
            
            
              | 
                164
               | 
              
                175
               | 
              
                         signup_info = MemberActivitySignupInfo.objects.get(user_id=user_id, activity_id=activity_id, main_activity_id=main_activity_id, status=True) 
               | 
            
            
            
              | 
                
               | 
              
                176
               | 
              
                + 
               | 
            
            
            
              | 
                
               | 
              
                177
               | 
              
                +        if user_name and user_avatar: 
               | 
            
            
            
              | 
                
               | 
              
                178
               | 
              
                +            signup_info.name = user_name 
               | 
            
            
            
              | 
                
               | 
              
                179
               | 
              
                +            signup_info.avatar = user_avatar 
               | 
            
            
            
              | 
                
               | 
              
                180
               | 
              
                +            signup_info.save() 
               | 
            
            
            
              | 
                165
               | 
              
                181
               | 
              
                     except MemberActivitySignupInfo.DoesNotExist: 
               | 
            
            
            
              | 
                166
               | 
              
                182
               | 
              
                         signup_info = None 
               | 
            
            
            
              | 
                167
               | 
              
                183
               | 
              
                  
               |