hujingpei 4 年之前
父節點
當前提交
259b529b0f
共有 2 個文件被更改,包括 2 次插入8 次删除
  1. 0 3
      apps/admin/tenant/views.py
  2. 2 5
      apps/tenant/models.py

+ 0 - 3
apps/admin/tenant/views.py

@@ -147,9 +147,6 @@ class MemberRemindViewSet(APIView):
         today_stamp = time.mktime(time.strptime(today, "%Y-%m-%d"))
         end_date = time.mktime(time.strptime(tenant.end_date.strftime('%Y-%m-%d'), '%Y-%m-%d'))
         diff = (int(end_date) - int(today_stamp))/86400
-
-        end_time = (timezone.now() + datetime.timedelta(days=30)).strftime('%Y-%m-%d')
-        tenant = Tenant.objects.filter(id=tenant.id,end_date__lte=end_time).first()
         notice = Notices.objects.filter(type=Notices.RENEW, end_time__isnull=True,tenant=tenant)
 
         if not notice and diff <= 30:

+ 2 - 5
apps/tenant/models.py

@@ -161,11 +161,8 @@ class Pay(models.Model):
         self.tenant.save()
         Pay.objects.filter(tenant=self.tenant, amount__isnull=True).delete()
 
-        try:
-            from apps.tenant.notices.models import Notices
-        except ImportError:
-            pass
-        Notices.objects.filter(tenant=self.tenant,type=Notices.RENEW).update(end_date=datetime.datetime.now())
+        from apps.tenant.notices.models import Notices
+        Notices.objects.filter(tenant=self.tenant,type=Notices.RENEW,end_data__isnull=True).update(end_date=datetime.datetime.now())
 
 
     # 支付宝回调,付款