api/encrypt_views.py

@@ -157,6 +157,6 @@ def decrypt(request):

                         },
              

                         'has_unexpired_activity': has_unexpired_activity,
              

                         'coupon_info': coupon_info,
              

                -        'redpack_info': elog.redpack_info if elog else {},
              

                +        'redpack_info': elog.redpack_info_list if elog else {},
              

                         'integral': model.integral,
              

                     })
              

logs/models.py

@@ -60,6 +60,11 @@ class MchInfoEncryptLogInfo(BaseModelMixin):

                             'clerk_nickname': self.clerk_nickname,
              

                         }
              

                 
              

                +    @property
              

                +    def redpack_info_list(self):
              

                +        logs = RedpackSendLogInfo.objects.filter(sn=self.sn, is_clerk_redpack=False)
              

                +        return [log.redpack_info for log in logs]
              

                +
              

                 
              

                 class MchInfoDecryptLogInfo(BaseModelMixin):
              

                     ciphertext = models.CharField(_(u'ciphertext'), max_length=64, blank=True, null=True, help_text=u'待解密字符串', db_index=True)
              
@@ -124,3 +129,11 @@ class RedpackSendLogInfo(BaseModelMixin):

                 
              

                     def __unicode__(self):
              

                         return unicode(self.pk)
              

                +
              

                +    @property
              

                +    def redpack_info(self):
              

                +        return {
              

                +            'user_id': self.user_id,
              

                +            'nickname': self.nickname,
              

                +            'redpack_amount': self.redpack_amount,
              

                +        }