优化消息检查订单代理套餐

AdminController/CloudServiceManage/AgentOrderController.py

@@ -94,10 +94,20 @@ class AgentOrderView(View):
         保存代理套餐
         """
         try:
+            order_qs = Order_Model.objects.filter(orderID=order_id, status=1).values('price', 'payTime', 'order_type')
+            if not order_qs.exists():
+                LOGGER.info(f'******save_agent_package当前代理客户未添加此套餐******ac_id:{ac_id},package_id:{package_id}')
+                return
+
+            order_type = order_qs[0]['order_type']
+
+            package_type = 2 if order_type in [2, 3, 5] else 1  # 判断订单信息是云存还是4G
+
             package_id = int(package_id)
-            agent_package_qs = AgentCloudServicePackage.objects.filter(package_id=package_id, status=1)
+            agent_package_qs = AgentCloudServicePackage.objects.filter(type=package_type, package_id=package_id,
+                                                                       status=1)
             if not agent_package_qs.exists():
-                LOGGER.info(f'******save_agent_package当前套餐未绑定代理******order_id:{order_id},serial_number:{serial_number}')
+                LOGGER.info(f'******save_agent_package当前套餐未设置代理******order_id:{order_id},serial_number:{serial_number}')
                 return
 
             agent_package = agent_package_qs.first()  # 代理云服务套餐
@@ -107,15 +117,12 @@ class AgentOrderView(View):
                 LOGGER.info(f'******save_agent_package当前代理客户未添加此套餐******ac_id:{ac_id},package_id:{package_id}')
                 return
 
-            order_qs = Order_Model.objects.filter(orderID=order_id, status=1).values('price', 'payTime')
-            if not order_qs.exists():
-                LOGGER.info(f'******save_agent_package当前代理客户未添加此套餐******ac_id:{ac_id},package_id:{package_id}')
-                return
             # 组装数据
             now_time = int(time.time())
 
             pay_price = Decimal(order_qs[0]['price']).quantize(Decimal('0.00'))
             profit = cls.calculate_order_profit(agent_package, pay_price)
+
             dict_data = {'ac_id': ac_id, 'serial_number': serial_number, 'csp_id': package_id,
                          'order_id': order_id, 'status': 1, 'profit_amount': pay_price, 'profit': profit,
                          'pay_time': order_qs[0]['payTime'], 'created_time': now_time, 'updated_time': now_time}