From 852b0ce9667d0422d51f226cb5c8128ca729beb0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 12:01:09 +0800
Subject: [PATCH] 后端订单查询列表-新版
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/OrderAdminController.java | 79 +++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 40 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 54bd45d..02763d3 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
@@ -30,7 +30,6 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
-import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
@Controller
@RequestMapping("admin/new/api/v1/order")
@@ -68,9 +67,8 @@
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
- * 娣樺疂璁㈠崟
+ * 鏌ヨ鎵�鏈夌敤鎴疯鍗曞垪琛�
* @param callback
* @param pageIndex
* @param pageSize
@@ -83,16 +81,25 @@
* @param endTime
* @param out
*/
- @RequestMapping(value = "getTBOrder")
- public void getTBOrder(String callback, Integer pageIndex, Integer keyType,
- String key, Integer state, String startTime, String endTime, PrintWriter 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) {
+
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
+ if (pageSize == null)
+ pageSize = Constant.PAGE_SIZE;
+
if (state != null && state == 0) {
state = null;// 鎵�鏈夌姸鎬�
+ }
+
+ if (type != null && type == 0) {
+ type = null; // 鎵�鏈夌被鍨嬭鍗�
}
if (endTime != null && endTime.trim().length() > 0) {
@@ -100,46 +107,24 @@
}
try {
-
long count = 0;
- int pageSize = Constant.PAGE_SIZE;
- List<TaoBaoOrderVO> listVO = null;
-
- if (key != null && key.trim().length() > 0 && keyType == 2) {
-
- // 鏌ヨ鍒楄〃
- List<CommonOrderVO> list = commonOrderService.listQueryByUid((pageIndex - 1) * pageSize, pageSize ,
- Long.parseLong(key), state, null, null, null, startTime, endTime, null);
-
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- // 缁熻鎬绘暟
- count = commonOrderService.countQueryByUid(Long.parseLong(key), state, null, null, null, startTime, endTime, null);
-
- } else {
-
- List<TaoBaoOrderVO> listQuery = taoBaoOrderService.listQuery((pageIndex - 1) * pageSize, pageSize, key, startTime, endTime, state);
-
- if (listQuery == null || listQuery.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- count= taoBaoOrderService.countQuery(key, startTime, endTime, state);
-
- }
-
+ // 鏌ヨ鍒楄〃
+ List<CommonOrderVO> list = commonOrderService.listQuery((pageIndex - 1) * pageSize, pageSize,
+ keyType, key, state, type, orderState, startTime, endTime);
+
+
+ if (list != null && list.size() > 0) {
+ // 缁熻鎬绘暟
+ count = commonOrderService.countQuery(keyType, key, state, type, orderState, startTime, endTime);
+ }
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
JSONObject data = new JSONObject();
data.put("pe", pe);
- data.put("result_list", listVO);
+ data.put("result_list", list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -150,9 +135,23 @@
e.printStackTrace();
}
}
-
-
+
+
+ /**
+ * 鏌ヨ璁㈠崟鍒楄〃鐢ㄦ埛uid
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param uid
+ * @param state
+ * @param type
+ * @param orderState
+ * @param orderNo
+ * @param startTime
+ * @param endTime
+ * @param out
+ */
@RequestMapping(value = "getHistoryOrder")
public void getHistoryOrder(String callback, Integer pageIndex, Integer pageSize, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, PrintWriter out) {
--
Gitblit v1.8.0