zhangdongming 3 жил өмнө
parent
commit
be72f21175

+ 1 - 2
Controller/UnicomCombo/UnicomComboController.py

@@ -23,7 +23,6 @@ from Object.UnicomObject import UnicomObjeect
 from Object.utils import LocalDateTimeUtil
 from Object.utils.PayUtil import PayService
 from Service.CommonService import CommonService
-from Object.RedisObject import RedisObject
 
 
 class UnicomComboView(View):
@@ -176,7 +175,7 @@ class UnicomComboView(View):
             experience_history_qs = UnicomComboExperienceHistory.objects.filter(iccid=iccid)
             if not experience_history_qs.exists():
                 logger.info('用户首次激活iccid={}'.format(iccid))
-                combo_qs = UnicomCombo.objects.filter(combo_type=1, status=0, is_show=1, is_del=False) \
+                combo_qs = UnicomCombo.objects.filter(combo_type=1, status=0, is_del=False) \
                     .values('id', 'expiration_type', 'expiration_days', 'combo_type')
                 if combo_qs.exists():
                     combo_qs = combo_qs.first()

+ 1 - 1
Object/UnicomObject.py

@@ -245,7 +245,7 @@ class UnicomObjeect:
         else:
             usage_history = UnicomObjeect().query_device_usage_history(**usage_data)
             usage_history = UnicomObjeect().get_text_dict(usage_history)
-            redis.set_data(key=key, val=json.dumps(usage_history.values()), expire=expire)
+            redis.set_data(key=key, val=json.dumps(usage_history), expire=expire)
         return usage_history