优化订单列表查询接口

Controller/OrderContrller.py

@@ -110,7 +110,7 @@ class OrderView(View):
                                                               "updTime", "paypal", "rank__day", "payType",
                                                               "rank__price", "status",
                                                               "rank__lang__content", "rank__title", "rank__currency",
-                                                              "rank_id","rank__expire")
+                                                              "rank_id", "rank__expire", 'store_meal_name', 'order_type')
         order_list = list(order_ql)
         data = []
         nowTime = int(time.time())
@@ -132,7 +132,10 @@ class OrderView(View):
                         d['serial_number'] = CommonService.get_full_serial_number(d['UID'], did['serial_number'], did['Type'])
                     data.append(d)
             d['rank__content'] = d['rank__lang__content']
-            d['rank__title'] = d['rank__title'] + '-' +d['rank__lang__content']
+            if d['order_type'] > 1:
+                d['rank__title'] = d['store_meal_name']
+            else:
+                d['rank__title'] = d['rank__title'] + '-' +d['rank__lang__content']
             del d['rank__lang__content']
             # d['rank__lang__content'] = '月' if lang == 'cn' else 'month'
         return response.json(0, {'data': data, 'count': count})