fix

app/service/order_service.py

@@ -145,12 +145,11 @@ class CurriculumOrderService:
         for order in orders:
             prod_type = order.get('ab_type', '')
             prod_id = order.get('ab_proid', '')
-            if prod_type == '1':
+            if prod_type == '1' and curriculum_column.get(prod_id, None):
                 order = {**order, **curriculum_column.get(prod_id, None)}
-                temp_orders.append(order)
-            elif prod_type in ['3', '4', '5']:
+            elif prod_type in ['3', '4', '5'] and curriculum_res.get(prod_id, None):
                 order = {**order, **curriculum_res.get(prod_id, None)}
-                temp_orders.append(order)
+            temp_orders.append(order)
         temp_orders = temp_orders[offset: offset+pageSize]
         allowed = {'id', 'title', 'cover', 'info', 'ab_type', 'ab_payment', 'ab_score', 'ab_pay_mode', 'ab_ordernum', 'transaction_serial_no', 'pay_method', 'createtime', 'pay_time', 'complete_time',
                    'ab_status', 'ab_pro_siid'}
@@ -377,14 +376,11 @@ def getAllOrders(args):
             prod_id = order.get('ab_proid', '')
             if prod_type == '6':
                 temp_orders.append(order)
-            elif prod_type == '1':
+            elif prod_type == '1' and curriculum_column.get(prod_id, None):
                 order = {**order, **curriculum_column.get(prod_id, None)}
-                temp_orders.append(order)
-            elif prod_type in ['3', '4', '5']:
+            elif prod_type in ['3', '4', '5'] and curriculum_res.get(prod_id, None):
                 order = {**order, **curriculum_res.get(prod_id, None)}
-                temp_orders.append(order)
-            else:
-                temp_orders.append(order)
+            temp_orders.append(order)
         allowed = {'id', 'title', 'cover', 'info', 'ab_type', 'ab_payment', 'ab_score', 'ab_pay_mode', 'ab_ordernum',
                    'transaction_serial_no', 'pay_method', 'createtime', 'pay_time', 'complete_time',
                    'ab_status', 'ab_pro_siid'}