From 90b211c63f9d596aa90b508f76eb916a30b68731 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 八月 2019 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 b8af594..03d7111 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
@@ -141,7 +141,7 @@
@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,
- Integer source, PrintWriter out) {
+ Integer sourceType, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -163,16 +163,12 @@
}
try {
- long count = 0;
-
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, keyType, key,
- state, type, orderState, startTime, endTime, source);
+ state, type, orderState, startTime, endTime, sourceType);
- if (list != null && list.size() > 0) {
// 缁熻鎬绘暟
- count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);
- }
+ long count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime, sourceType);
// 鏌ヨ鏄惁缁存潈
for (CommonOrderVO order : list) {
--
Gitblit v1.8.0