首页增加云盘数据

AdminController/IcloudManagementController.py

@@ -44,6 +44,8 @@ class IcloudServeView(View):
                 return self.get_icloud_store_meal_list(request_dict, response)
             elif operation == 'addOrEditIcloudStoreMeal':
                 return self.add_or_edit_icloud_store_meal(request_dict, response)
+            elif operation == 'getBucket':
+                return self.get_bucket(request_dict, response)
             elif operation == 'deleteMeal':
                 return self.delete_meal(request_dict, response)
             # icloud套餐语言相关
@@ -85,6 +87,8 @@ class IcloudServeView(View):
                     ICloudStoreMeal.objects.filter(id=icloud_meal['id']).values('pay_type__id', 'pay_type__payment'))
                 # 获取存储桶信息
                 vod_bucket_qs = VodBucketModel.objects.filter(id=icloud_meal['bucket_id']).values('bucket')
+                if not vod_bucket_qs.exists():
+                    return response.json(173)
                 # 组织响应数据
                 icloud_meal_list.append({
                     'IcloudMealID': icloud_meal['id'],
@@ -117,8 +121,9 @@ class IcloudServeView(View):
         is_delete = int(request_dict.get('is_delete', 0))
         size = float(request_dict.get('size', None))
         is_edit = request_dict.get('isEdit', None)
+        bucket_id = request_dict.get('bucket_id', None)
 
-        if not all([expire, price, currency, symbol, pay_type, size]):
+        if not all([expire, price, currency, symbol, pay_type, size, bucket_id]):
             return response.json(444)
         pay_type = pay_type.split(',')
         try:
@@ -129,7 +134,8 @@ class IcloudServeView(View):
                 'symbol': symbol,
                 'is_show': is_show,
                 'size': size,
-                'is_delete': is_delete
+                'is_delete': is_delete,
+                'bucket_id': bucket_id
             }
             if is_edit:
                 if not meal_id:
@@ -144,6 +150,15 @@ class IcloudServeView(View):
             print(e)
             return response.json(500, repr(e))
 
+    @staticmethod
+    def get_bucket(request_dict, response):
+        try:
+            bucket_qs = VodBucketModel.objects.all().values('id', 'bucket')
+            return response.json(0, list(bucket_qs))
+        except Exception as e:
+            print(e)
+            return response.json(500, repr(e))
+
     @staticmethod
     def delete_meal(request_dict, response):
         meal_id = request_dict.get('meal_id', None)

AdminController/dataSystemManagement/HomeDataController.py

@@ -130,7 +130,7 @@ class HomeDataView(View):
                 usd_total = round(usd_total + temp_total.get('USD', 0), 2)
             order_total = {'cnyTotal': cny_total, 'usdTotal': usd_total}
             # 昨日云存订单销售额
-            vod_order_total = order_qs.filter(service_type=0)
+            vod_order_total = order_qs.filter(service_type__in=[0, 1])
             vod_cny_total = 0
             vod_usd_total = 0
             for item in vod_order_total:
@@ -138,17 +138,17 @@ class HomeDataView(View):
                 vod_cny_total = round(vod_cny_total + temp_total.get('CNY', 0), 2)
                 vod_usd_total = round(vod_usd_total + temp_total.get('USD', 0), 2)
             vod_order_total = {'cnyTotal': vod_cny_total, 'usdTotal': vod_usd_total}
-            # 昨日AI订单销售额
-            ai_order_total = order_qs.filter(service_type=1)
-            ai_cny_total = 0
-            ai_usd_total = 0
-            for item in ai_order_total:
+            # 昨日云盘订单销售额
+            icloud_order_total = order_qs.filter(service_type=4)
+            icloud_cny_total = 0
+            icloud_usd_total = 0
+            for item in icloud_order_total:
                 temp_total = eval(item['total'])
-                ai_cny_total = round(ai_cny_total + temp_total.get('CNY', 0), 2)
-                ai_usd_total = round(ai_usd_total + temp_total.get('USD', 0), 2)
-            ai_order_total = {'cnyTotal': ai_cny_total, 'usdTotal': ai_usd_total}
+                icloud_cny_total = round(icloud_cny_total + temp_total.get('CNY', 0), 2)
+                icloud_usd_total = round(icloud_usd_total + temp_total.get('USD', 0), 2)
+            icloud_order_total = {'cnyTotal': icloud_cny_total, 'usdTotal': icloud_usd_total}
             # 昨日联通订单销售额
-            unicom_order_total = order_qs.filter(service_type=2)
+            unicom_order_total = order_qs.filter(service_type__in=[2, 3])
             unicom_cny_total = 0
             unicom_usd_total = 0
             for item in unicom_order_total:
@@ -166,7 +166,7 @@ class HomeDataView(View):
                 usd_all_total = round(usd_all_total + temp_total.get('USD', 0), 2)
             order_all_total = {'cnyTotal': cny_all_total, 'usdTotal': usd_all_total}
             # 所有云存订单销售额
-            vod_order_all_total = order_all_qs.filter(service_type=0)
+            vod_order_all_total = order_all_qs.filter(service_type__in=[0, 1])
             vod_cny_all_total = 0
             vod_usd_all_total = 0
             for item in vod_order_all_total:
@@ -174,15 +174,15 @@ class HomeDataView(View):
                 vod_cny_all_total = round(vod_cny_all_total + temp_total.get('CNY', 0), 2)
                 vod_usd_all_total = round(vod_usd_all_total + temp_total.get('USD', 0), 2)
             vod_order_all_total = {'cnyTotal': vod_cny_all_total, 'usdTotal': vod_usd_all_total}
-            # 所有AI订单销售额
-            ai_order_all_total = order_all_qs.filter(service_type=1)
-            ai_cny_all_total = 0
-            ai_usd_all_total = 0
-            for item in ai_order_all_total:
+            # 所有云盘订单销售额
+            icloud_order_all_total = order_all_qs.filter(service_type=4)
+            icloud_cny_all_total = 0
+            icloud_usd_all_total = 0
+            for item in icloud_order_all_total:
                 temp_total = eval(item['total'])
-                ai_cny_all_total = round(ai_cny_all_total + temp_total.get('CNY', 0), 2)
-                ai_usd_all_total = round(ai_usd_all_total + temp_total.get('USD', 0), 2)
-            ai_order_all_total = {'cnyTotal': ai_cny_all_total, 'usdTotal': ai_usd_all_total}
+                icloud_cny_all_total = round(icloud_cny_all_total + temp_total.get('CNY', 0), 2)
+                icloud_usd_all_total = round(icloud_usd_all_total + temp_total.get('USD', 0), 2)
+            icloud_order_all_total = {'cnyTotal': icloud_cny_all_total, 'usdTotal': icloud_usd_all_total}
             # 所有联通订单销售额
             unicom_order_all_total = order_all_qs.filter(service_type=2)
             unicom_cny_all_total = 0
@@ -201,11 +201,11 @@ class HomeDataView(View):
                 'deviceAllCount': device_all_count,
                 'orderTotal': order_total,
                 'vodOrderTotal': vod_order_total,
-                'aiOrderTotal': ai_order_total,
+                'icloudOrderTotal': icloud_order_total,
                 'unicomOrderTotal': unicom_order_total,
                 'orderAllTotal': order_all_total,
                 'vodOrderAllTotal': vod_order_all_total,
-                'aiOrderAllTotal': ai_order_all_total,
+                'icloudOrderAllTotal': icloud_order_all_total,
                 'unicomOrderAllTotal': unicom_order_all_total,
                 'userIncreaseRegion': user_increase_region_list,
                 'userAllRegion': user_all_region_list
@@ -278,11 +278,11 @@ class HomeDataView(View):
             device_all_count = 0
             order_total = {'cnyTotal': 0, 'usdTotal': 0}
             vod_order_total = {'cnyTotal': 0, 'usdTotal': 0}
-            ai_order_total = {'cnyTotal': 0, 'usdTotal': 0}
+            icloud_order_total = {'cnyTotal': 0, 'usdTotal': 0}
             unicom_order_total = {'cnyTotal': 0, 'usdTotal': 0}
             order_all_total = {'cnyTotal': 0, 'usdTotal': 0}
             vod_order_all_total = {'cnyTotal': 0, 'usdTotal': 0}
-            ai_order_all_total = {'cnyTotal': 0, 'usdTotal': 0}
+            icloud_order_all_total = {'cnyTotal': 0, 'usdTotal': 0}
             unicom_order_all_total = {'cnyTotal': 0, 'usdTotal': 0}
             user_increase_temp_list = []
             user_increase_list = []
@@ -309,10 +309,10 @@ class HomeDataView(View):
                         vod_order_total['cnyTotal'] + result['result']['vodOrderTotal']['cnyTotal'], 2)
                     vod_order_total['usdTotal'] = round(
                         vod_order_total['usdTotal'] + result['result']['vodOrderTotal']['usdTotal'], 2)
-                    ai_order_total['cnyTotal'] = round(
-                        ai_order_total['cnyTotal'] + result['result']['aiOrderTotal']['cnyTotal'], 2)
-                    ai_order_total['usdTotal'] = round(
-                        ai_order_total['usdTotal'] + result['result']['aiOrderTotal']['usdTotal'], 2)
+                    icloud_order_total['cnyTotal'] = round(
+                        icloud_order_total['cnyTotal'] + result['result']['icloudOrderTotal']['cnyTotal'], 2)
+                    icloud_order_total['usdTotal'] = round(
+                        icloud_order_total['usdTotal'] + result['result']['icloudOrderTotal']['usdTotal'], 2)
                     unicom_order_total['cnyTotal'] = round(
                         unicom_order_total['cnyTotal'] + result['result']['unicomOrderTotal']['cnyTotal'], 2)
                     unicom_order_total['usdTotal'] = round(
@@ -325,10 +325,10 @@ class HomeDataView(View):
                         vod_order_all_total['cnyTotal'] + result['result']['vodOrderAllTotal']['cnyTotal'], 2)
                     vod_order_all_total['usdTotal'] = round(
                         vod_order_all_total['usdTotal'] + result['result']['vodOrderAllTotal']['usdTotal'], 2)
-                    ai_order_all_total['cnyTotal'] = round(
-                        ai_order_all_total['cnyTotal'] + result['result']['aiOrderAllTotal']['cnyTotal'], 2)
-                    ai_order_all_total['usdTotal'] = round(
-                        ai_order_all_total['usdTotal'] + result['result']['aiOrderAllTotal']['usdTotal'], 2)
+                    icloud_order_all_total['cnyTotal'] = round(
+                        icloud_order_all_total['cnyTotal'] + result['result']['icloudOrderAllTotal']['cnyTotal'], 2)
+                    icloud_order_all_total['usdTotal'] = round(
+                        icloud_order_all_total['usdTotal'] + result['result']['icloudOrderAllTotal']['usdTotal'], 2)
                     unicom_order_all_total['cnyTotal'] = round(
                         unicom_order_all_total['cnyTotal'] + result['result']['unicomOrderAllTotal']['cnyTotal'], 2)
                     unicom_order_all_total['usdTotal'] = round(
@@ -394,11 +394,11 @@ class HomeDataView(View):
                 'deviceAllCount': device_all_count,
                 'orderTotal': order_total,
                 'vodOrderTotal': vod_order_total,
-                'aiOrderTotal': ai_order_total,
+                'icloudOrderTotal': icloud_order_total,
                 'unicomOrderTotal': unicom_order_total,
                 'orderAllTotal': order_all_total,
                 'vodOrderAllTotal': vod_order_all_total,
-                'aiOrderAllTotal': ai_order_all_total,
+                'icloudOrderAllTotal': icloud_order_all_total,
                 'unicomOrderAllTotal': unicom_order_all_total,
                 'userIncreaseRegion': user_increase_list,
                 'userAllRegion': user_all_list