From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
index 723a795..9d21266 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java
@@ -42,7 +42,7 @@
*/
@RequestMapping("query")
public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
- Integer handleType, PrintWriter out) {
+ Integer handleType, Integer type, PrintWriter out) {
if (pageIndex == null || pageIndex < 0){
pageIndex = 1;
@@ -54,7 +54,7 @@
try {
- List<LostOrder> list = lostOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state, handleType);
+ List<LostOrder> list = lostOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state, handleType, type);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏇村鏁版嵁"));
return;
@@ -103,7 +103,7 @@
}
}
- long count = lostOrderService.countQuery(key, state, handleType);
+ long count = lostOrderService.countQuery(key, state, handleType, type);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
--
Gitblit v1.8.0