优化订购联通流量套餐包

AdminController/UnicomManageController.py

@@ -115,7 +115,7 @@ class UnicomManageControllerView(View):
                 return response.json(404)
 
     @classmethod
-    def order_flow_package(cls, request_dict, response, user):
+    def order_flow_package(cls, request_dict, response, user_id):
         """
         订购流量套餐包
         """
@@ -124,35 +124,11 @@ class UnicomManageControllerView(View):
             package_id = request_dict.get('packageId', None)
             if not all([serial_number, package_id]):
                 return response.json(444)
-            u_device_info_qs = UnicomDeviceInfo.objects.filter(serial_no=serial_number, card_type=0) \
-                .exclude(Q(user_id__isnull=True) | Q(user_id=''))
-            if not u_device_info_qs.exists():
-                return response.json(173)
-            package_id = int(package_id)
-            combo_qs = UnicomCombo.objects.filter(id=package_id) \
-                .values('id', 'combo_name', 'price', 'virtual_price', 'remark').order_by('sort')
-            if not combo_qs.exists():
-                return response.json(173)
-
-            now_time = int(time.time())
-            combo_info_vo = combo_qs[0]
-            u_device_info = u_device_info_qs.first()
-            rank_id, ai_rank_id = UnicomComboView.get_cloud_or_ai_combo()  # 生成订单必须添加该字段
-            uid = CommonService.query_uid_with_serial(serial_number)
-
-            order_id = CommonService.createOrderID()
-            order_dict = {'orderID': order_id, 'UID': uid, 'rank_id': rank_id, 'ai_rank_id': ai_rank_id,
-                          'userID_id': u_device_info.user_id, 'desc': combo_info_vo['combo_name'], 'payType': 10,
-                          'payTime': now_time, 'price': combo_info_vo['price'], 'addTime': now_time,
-                          'updTime': now_time, 'status': 1,
-                          'unify_combo_id': str(combo_info_vo['id']), 'order_type': 2,
-                          'store_meal_name': combo_info_vo['combo_name']
-                          }
-            Order_Model.objects.create(**order_dict)
-            LOGGER.info(f'{serial_number}订购流量套餐包,createdBy：{user}')
-            UnicomComboView.create_combo_order_info(order_id, 0, u_device_info.iccid, package_id)
-            if u_device_info.status != 2:
-                UnicomDeviceInfo.objects.filter(iccid=u_device_info.iccid).update(status=2, updated_time=now_time)
+            serial_number = serial_number[0:9]
+            result = UnicomComboView().generate_flow_package(serial_number, int(package_id), user_id)
+            LOGGER.info(f'{serial_number}订购流量套餐包,createdBy:{user_id},result:{result}')
+            if not result:
+                response.json(503)
             return response.json(0)
         except Exception as e:
             LOGGER.info('UnicomManageControllerView.order_flow_package,errLine:{}, errMsg:{}'