Commit 43e22be5 authored by pengxiong's avatar pengxiong

全部订单查询

parent 4c1c902c
...@@ -374,9 +374,7 @@ def getAllOrders(args): ...@@ -374,9 +374,7 @@ def getAllOrders(args):
for order in orders: for order in orders:
prod_type = order.get('ab_type', '') prod_type = order.get('ab_type', '')
prod_id = order.get('ab_proid', '') prod_id = order.get('ab_proid', '')
if prod_type == '6': if prod_type == '1' and curriculum_column.get(prod_id, None):
temp_orders.append(order)
elif prod_type == '1' and curriculum_column.get(prod_id, None):
order = {**order, **curriculum_column.get(prod_id, None)} order = {**order, **curriculum_column.get(prod_id, None)}
elif prod_type in ['3', '4', '5'] and curriculum_res.get(prod_id, None): elif prod_type in ['3', '4', '5'] and curriculum_res.get(prod_id, None):
order = {**order, **curriculum_res.get(prod_id, None)} order = {**order, **curriculum_res.get(prod_id, None)}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment