api/encrypt_views.py

@@ -156,7 +156,7 @@ def decrypt(request, v='v2'):

                 
              

                     else:
              

                         activities = ActivityInfo.objects.filter(status=True).order_by('-pk')
              

                -        coupon_infos = [act.coupon_info3 for act in activities if act and act.has_unexpired_activity(model.model_uni_name)]
              

                +        coupon_infos = [act.coupon_info3 for act in activities if act and act.has_unexpired_activity(model.model_name)]
              

                 
              

                     return response(200, data={
              

                         'plaintext': plaintext,
              
@@ -252,7 +252,7 @@ def decrypt2(request, v='v2'):

                 
              

                     else:
              

                         activities = ActivityInfo.objects.filter(status=True).order_by('-pk')
              

                -        coupon_infos = [act.coupon_info3 for act in activities if act.has_unexpired_activity(model.model_uni_name)]
              

                +        coupon_infos = [act.coupon_info3 for act in activities if act.has_unexpired_activity(model.model_name)]
              

                 
              

                     return response(200, data={
              

                         'plaintext': plaintext,
              

mch/models.py

@@ -899,7 +899,7 @@ class ActivityInfo(BaseModelMixin):

                         return tc.local_string(utc_dt=final_expire_at, format=u'%Y年%m月%d日', isuc=True)
              

                 
              

                     def has_unexpired_activity(self, model_name):
              

                -        return ((self.model_uni_names and model_name in self.model_uni_names) or not self.model_uni_names) and (self.start_at <= tc.utc_datetime() < self.end_at)
              

                +        return (self.model_uni_names and len([model_uni_name for model_uni_name in self.model_uni_names if model_uni_name in model_name]) > 0) and (self.start_at <= tc.utc_datetime() < self.end_at)
              

                 
              

                     def coupon_info(self, created_at=None):
              

                         return {