服务数据返回

AdminController/dataSystemManagement/ServiceDataController.py

@@ -106,7 +106,7 @@ class ServiceDataView(View):
                 for k, v in device_type_temp_dict.items():
                     if k in device_type_dict:
                         device_type_dict[k]['数量'] += v['数量']
-                        device_type_dict[k]['销售额'] = str(round(float(device_type_dict[k]['销售额']) + float(v['销售额']), 2))
+                        device_type_dict[k]['销售额'] = round(device_type_dict[k]['销售额'] + v['销售额'], 2)
                     else:
                         device_type_dict[k] = v
                 for k, v in country_temp_dict.items():
@@ -117,15 +117,14 @@ class ServiceDataView(View):
                 for k, v in store_meal_temp_dict.items():
                     if k in store_meal_dict:
                         store_meal_dict[k]['数量'] += v['数量']
-                        store_meal_dict[k]['销售额'] = str(
-                            round(float(store_meal_dict[k]['销售额']) + float(v['销售额']), 2))
+                        store_meal_dict[k]['销售额'] = round(store_meal_dict[k]['销售额'] + v['销售额'], 2)
                     else:
                         store_meal_dict[k] = v
             # 设备类型订单统计
             device_type_list = []
             for k, v in device_type_dict.items():
                 type_rate = round(v['数量'] / all_order_count * 100, 2) if all_order_count else 0
-                total_rate = round(float(v['销售额']) / all_order_total * 100, 2) if all_order_total else 0
+                total_rate = round(v['销售额'] / all_order_total * 100, 2) if all_order_total else 0
                 device_temp_dict = {
                     'typeName': k,
                     'count': v['数量'],