@@ -79,7 +79,7 @@ urlpatterns += [ |
||
79 | 79 |
# 支付相关 |
80 | 80 |
urlpatterns += [ |
81 | 81 |
url(r'^wx/order_create$', pay_views.wx_order_create_api, name='wx_order_create_api'), # 订单创建 |
82 |
- url(r'^wx/order_query$', pay_views.wx_order_query_api, name='wx_order_query_api'), # 订单查询 |
|
82 |
+ url(r'^wx/order_query$', pay_views.wx_order_query_api, name='wx_order_query_api'), # 订单查询补单 |
|
83 | 83 |
url(r'^wx/order_list$', pay_views.wx_order_list_api, name='wx_order_list_api'), # 订单列表 |
84 | 84 |
url(r'^wx/order_detail$', pay_views.wx_order_detail_api, name='wx_order_detail_api'), # 订单详情 |
85 | 85 |
url(r'^wx/notify_url$', pay_views.wx_notify_url_api, name='wx_notify_url_api'), # 支付异步通知回调地址 |
@@ -10,6 +10,6 @@ PAI2_HOME_API = ( |
||
10 | 10 |
r"left outer join group_groupinfo as T2 on T1.group_id = T2.group_id " |
11 | 11 |
r"left outer join group_groupphotoinfo as T3 on T1.group_id = T3.group_id and T3.id > T1.current_id " |
12 | 12 |
r"where T3.status = 1 " |
13 |
- r"order by DATE(T3.created_at) desc, T3.thumbup_num desc " |
|
13 |
+ r"order by FIELD(T3.user_id, '{user_id}') desc, DATE(T3.created_at) desc, T3.thumbup_num desc " |
|
14 | 14 |
r"limit {offset}, {rows};" |
15 | 15 |
) |