From ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期二, 18 二月 2020 12:50:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java | 204 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 166 insertions(+), 38 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 e5136f8..47b7793 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
@@ -2,18 +2,22 @@
import java.io.PrintWriter;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.bus.user.LostOrder;
+import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.GsonUtil;
-import org.yeshi.utils.JsonUtil;
import net.sf.json.JSONObject;
@@ -24,46 +28,170 @@
@Resource
private LostOrderService lostOrderService;
- @RequestMapping("findLostOrderList")
- public void findLostOrderList(int page, String key, PrintWriter out) {
- List<LostOrder> list = lostOrderService.findLostOrderList(key, page);
- int count = lostOrderService.getCount(key);
- PageEntity pe = new PageEntity(page, Constant.PAGE_SIZE, count);
- JSONObject data = new JSONObject();
- data.put("pe", pe);
- data.put("lostOrderList", GsonUtil.toJsonByUserAp(list));
- out.print(JsonUtil.loadTrueResult(data));
+ /**
+ * 鏂扮増鍚庡彴 鍒楄〃鏌ヨ
+ * @param callback
+ * @param pageIndex
+ * @param key
+ * @param out
+ */
+ @RequestMapping("query")
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ Integer handleType, Integer type, PrintWriter out) {
+
+ if (pageIndex == null || pageIndex < 0){
+ pageIndex = 1;
+ }
+
+ if (pageSize == null || pageSize < 1) {
+ pageSize = Constant.PAGE_SIZE;
+ }
+
+ try {
+
+ 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;
+ }
+
+
+ for (LostOrder lostOrder: list) {
+
+ Integer stateOrder = lostOrder.getState();
+ Integer resultCode = lostOrder.getResultCode();
+ if (stateOrder != null && stateOrder == 1 && resultCode!= null) {
+ switch(resultCode) {
+ case 1:
+ lostOrder.setRemake("绛夊緟鐖彇涓�");
+ break;
+ case 2:
+ lostOrder.setRemake("澶勭悊鎴愬姛");
+ break;
+ case 3:
+ lostOrder.setState(2);
+ lostOrder.setRemake("澶勭悊澶辫触");
+ break;
+ default:
+ break;
+ }
+ } else if (stateOrder != null && stateOrder == 2) {
+ lostOrder.setRemake("宸叉嫆缁�");
+ }
+
+
+ Order order = lostOrder.getOrder();
+ if (order == null) {
+ lostOrder.setOrder(new Order());
+ }
+
+
+ UserInfo userInfo = lostOrder.getUserInfo();
+ if (userInfo == null) {
+ lostOrder.setUserInfo(new UserInfo());
+ } else {
+ Map<String, Object> countData = lostOrderService.countByUid(userInfo.getId());
+ lostOrder.setTotal(Integer.parseInt(countData.get("total")+""));
+ lostOrder.setTotalPass(Integer.parseInt(countData.get("totalPass")+""));
+ lostOrder.setTotalReject(Integer.parseInt(countData.get("totalReject")+""));
+
+ }
+ }
+
+ 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);
+
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls();
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+ JSONObject data = new JSONObject();
+ data.put("pe", pe);
+ data.put("result_list", gson.toJson(list));
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鏂扮増鍚庡彴 閫氳繃
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping("passOrder")
+ public void passOrder(String callback, Long id, PrintWriter out) {
+
+ if (id == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+ return;
+ }
+
+ try {
+ LostOrder lostOrder = lostOrderService.getOne(id);
+ if (lostOrder == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鏌ヨ璁㈠崟"));
+ return;
+ }
+
+ if (lostOrder.getState() != 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ヨ鍗曞凡澶勭悊"));
+ return;
+ }
+
+ lostOrderService.pass(lostOrder);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+
}
- @RequestMapping("pass")
- public void pass(long id, PrintWriter out) {
- LostOrder lostOrder = lostOrderService.getOne(id);
- if (lostOrder == null) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鏌ヨ璁㈠崟"));
+
+ /**
+ * 鏂扮増鍚庡彴 鎷掔粷
+ * @param callback
+ * @param id
+ * @param reason
+ * @param out
+ */
+ @RequestMapping("rejectOrder")
+ public void rejectOrder(String callback, Long id, String reason, PrintWriter out) {
+ if (id == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
return;
}
- if (lostOrder.getState() != 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ鍗曞凡澶勭悊"));
- return;
+
+ try {
+
+ LostOrder lostOrder = lostOrderService.getOne(id);
+ if (lostOrder == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鏌ヨ璁㈠崟"));
+ return;
+ }
+
+ if (lostOrder.getState() != 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ヨ鍗曞凡澶勭悊"));
+ return;
+ }
+
+ lostOrder.setRemake(reason);
+ lostOrderService.reject(lostOrder);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
}
- lostOrderService.pass(lostOrder);
- out.print(JsonUtil.loadTrueResult(""));
+
}
-
- @RequestMapping("reject")
- public void reject(long id,String reason, PrintWriter out) {
- LostOrder lostOrder = lostOrderService.getOne(id);
- if (lostOrder == null) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鏌ヨ璁㈠崟"));
- return;
- }
- if (lostOrder.getState() != 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ鍗曞凡澶勭悊"));
- return;
- }
- lostOrder.setRemake(reason);
- lostOrderService.reject(lostOrder);
- out.print(JsonUtil.loadTrueResult(""));
- }
-
+
}
--
Gitblit v1.8.0