新增无限流量

Controller/UnicomCombo/UnicomComboController.py

@@ -102,13 +102,14 @@ class UnicomComboView(View):
             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')
+                        'year', 'month', 'flow_total_usage', 'expire_time', 'activation_time', 'combo__is_unlimited')
             if combo_order_qs.exists():
                 combo_order = combo_order_qs.first()
                 flow_details = {
                     'flowInvalid': 0,
                     'iccid': iccid,
                     'status': combo_order['status'],
+                    'is_unlimited': combo_order['combo__is_unlimited'],
                     'comboName': combo_order['combo__combo_name'],
                     'comboType': combo_order['combo__combo_type'],
                     'flowTotal': combo_order['combo__flow_total'],
@@ -162,12 +163,13 @@ class UnicomComboView(View):
         combo_order_qs = UnicomComboOrderInfo.objects.filter(iccid=iccid, is_del=False) \
             .values('iccid', 'status', 'combo__combo_name', 'combo__flow_total',
                     'combo__remark', 'combo__expiration_days', 'combo__expiration_type', 'flow_total_usage',
-                    'expire_time').order_by('sort')
+                    'expire_time', 'combo__is_unlimited').order_by('sort')
         for item in combo_order_qs:
             combo_list.append({
                 'iccid': iccid,
                 'status': item['status'],
                 'comboName': item['combo__combo_name'],
+                'is_unlimited': item['combo__is_unlimited'],
                 'flowTotal': item['combo__flow_total'],
                 'comboRemark': item['combo__remark'],
                 'expirationDays': item['combo__expiration_days'],

Controller/UnicomCombo/UnicomComboTaskController.py

@@ -9,6 +9,7 @@
 import datetime
 import logging
 import time
+from decimal import Decimal
 
 from django.db import transaction
 from django.db.models import Q
@@ -86,6 +87,8 @@ class UnicomComboTaskView(View):
                             continue
                         # 查询当月用量情况
                         flow_total_usage = unicom_api.get_flow_usage_total(year, month, item['iccid'])
+                        flow_total_usage = Decimal(flow_total_usage).quantize(
+                            Decimal('0.00')) if flow_total_usage > 0 else 0
                         flow_total_usage = str(flow_total_usage)
                         iccid = item['iccid']
                         # 检查激活iccid
@@ -107,7 +110,7 @@ class UnicomComboTaskView(View):
         logger.info('--->进入监控流量使用情况')
         try:
             unicom_api = UnicomObjeect()
-            combo_order_qs = UnicomComboOrderInfo.objects.filter(status=1, is_del=False).values()
+            combo_order_qs = UnicomComboOrderInfo.objects.filter(status=1, is_del=False, combo__is_unlimited=0).values()
             if not combo_order_qs.exists():
                 return response.json(0)
             today = datetime.datetime.today()