修改4G套餐列表倒叙

Controller/UnicomCombo/UnicomComboController.py

@@ -248,7 +248,7 @@ class UnicomComboView(View):
         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')
+                    'expire_time', 'combo__is_unlimited').order_by('-expire_time')
         for item in combo_order_qs:
             combo_list.append({
                 'iccid': iccid,

Controller/UnicomCombo/WXTechController.py

@@ -149,15 +149,17 @@ class WXTechControllerView(View):
                 .values('serial_number', 'package_id')
 
             if bind_package_qs.exists():
+                prefix_name = '免费领取'
                 combo_info_qs = UnicomCombo.objects.filter(id=bind_package_qs[0]['package_id']) \
                     .values('combo_name')
             else:  # 查询免费体验
                 combo_info_qs = UnicomCombo.objects.filter(combo_type=1, status=0, is_del=False) \
                     .values('combo_name')
+                prefix_name = '领取'
                 if not combo_info_qs.exists():
                     return response.json(173)
 
-            result = {'comboName': '欢迎使用周视摄像头' + '\n' + '请领取' + combo_info_qs[0]['combo_name']}
+            result = {'comboName': prefix_name + combo_info_qs[0]['combo_name']}
             return response.json(0, result)
         except Exception as e:
             LOGGER.info('*****WXTechController.get_experience_package:errLine:{}, errMsg:{}'