zhangdongming 3 years ago
parent
commit
a86e32b102
1 changed files with 4 additions and 5 deletions
  1. 4 5
      Controller/UnicomCombo/UnicomComboController.py

+ 4 - 5
Controller/UnicomCombo/UnicomComboController.py

@@ -96,10 +96,7 @@ class UnicomComboView(View):
             if not unicom_device_info_qs[0].user_id:
                 unicom_device_info_qs.update(user_id=user_id)
             unicom_api = UnicomObjeect()
-            now_time = int(time.time())
-            before_days = LocalDateTimeUtil.get_before_days_timestamp(now_time, 30)
-            combo_order_qs = UnicomComboOrderInfo.objects.filter(iccid=iccid, status=1, is_del=False,
-                                                                 created_time__gt=before_days) \
+            combo_order_qs = UnicomComboOrderInfo.objects.filter(iccid=iccid, status=1, is_del=False) \
                 .values('iccid', 'status', 'combo__status', 'combo__combo_name', 'combo__combo_type',
                         'combo__flow_total', 'combo__remark', 'combo__expiration_days', 'combo__expiration_type',
                         'year', 'month', 'flow_total_usage', 'expire_time', 'activation_time', 'combo__is_unlimited')
@@ -152,7 +149,9 @@ class UnicomComboView(View):
         @return:
         """
         combo_list = []
-        combo_order_qs = UnicomComboOrderInfo.objects.filter(iccid=iccid, is_del=False) \
+        now_time = int(time.time())
+        before_days = LocalDateTimeUtil.get_before_days_timestamp(now_time, 90)
+        combo_order_qs = UnicomComboOrderInfo.objects.filter(iccid=iccid, is_del=False, created_time__gt=before_days) \
             .values('iccid', 'status', 'combo__combo_name', 'combo__flow_total',
                     'combo__remark', 'combo__expiration_days', 'combo__expiration_type', 'flow_total_usage',
                     'expire_time', 'combo__is_unlimited').order_by('sort')