From e8fdda367bfe4cf79f887dd9f242ee1eb3b2d394 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 17:43:17 +0800
Subject: [PATCH] 增小黄条位置种类
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
index ecdd9c6..b8af594 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java
@@ -139,8 +139,9 @@
* @param out
*/
@RequestMapping(value = "getUserOrderList")
- public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType, String key,
- Integer state, Integer type, Integer orderState, String startTime, String endTime, PrintWriter out) {
+ public void getUserOrderList(String callback, Integer pageIndex, Integer pageSize, Integer keyType,
+ String key, Integer state, Integer type, Integer orderState, String startTime, String endTime,
+ Integer source, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -166,11 +167,11 @@
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
- state, type, orderState, startTime, endTime);
+ state, type, orderState, startTime, endTime, source);
if (list != null && list.size() > 0) {
// 缁熻鎬绘暟
- count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime);
+ count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
}
// 鏌ヨ鏄惁缁存潈
--
Gitblit v1.8.0