From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LostOrderAdminController.java | 212 +++++++---------------------------------------------
1 files changed, 29 insertions(+), 183 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 92befeb..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
@@ -1,14 +1,10 @@
package com.yeshi.fanli.controller.admin;
import java.io.PrintWriter;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,8 +18,8 @@
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 com.yeshi.fanli.util.StringUtil;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/lostOrder")
@@ -32,49 +28,6 @@
@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));
- }
-
- @RequestMapping("pass")
- public void pass(long id, PrintWriter out) {
- LostOrder lostOrder = lostOrderService.getOne(id);
- if (lostOrder == null) {
- out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ鏌ヨ璁㈠崟"));
- return;
- }
- if (lostOrder.getState() != 0) {
- out.print(JsonUtil.loadFalseResult("璇ヨ鍗曞凡澶勭悊"));
- return;
- }
- 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(""));
- }
-
-
/**
* 鏂扮増鍚庡彴 鍒楄〃鏌ヨ
* @param callback
@@ -84,7 +37,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;
@@ -96,7 +49,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;
@@ -105,12 +58,35 @@
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();
+
+ UserInfo userInfo = lostOrder.getUserInfo();
if (userInfo == null) {
lostOrder.setUserInfo(new UserInfo());
} else {
@@ -122,7 +98,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);
@@ -218,134 +194,4 @@
}
-
- /**
- * 楠岃瘉缁熻淇℃伅鍙傛暟
- * @param shwoType
- * @param startTime
- * @param endTime
- * @return
- */
- public String validateParams(Integer shwoType, String startTime, String endTime) {
-
- if (shwoType == null) {
- return "璇烽�夋嫨瑙嗗浘绫诲瀷";
- }
-
- if (shwoType == 1 && (StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime))) {
- return "璇烽�夋嫨鏃堕棿鍖洪棿";
- }
-
- if (!StringUtil.isNullOrEmpty(startTime) && StringUtil.isNullOrEmpty(endTime)) {
- return "璇烽�夌粨鏉熸棩鏈�";
- }
-
- if (StringUtil.isNullOrEmpty(startTime) && !StringUtil.isNullOrEmpty(endTime)) {
- return "璇烽�夎捣濮嬫棩鏈�";
- }
-
- return null;
- }
-
-
- /**
- * 缁熻鎻愮幇鐢宠鎬绘鏁�
- * @param callback
- * @param dateType 鏄剧ず瑙嗗浘锛氭棩-1 銆佹湀-2銆� 骞�-3
- * @param state 鐘舵�侊細 1-鏈鐞� 2-鎴愬姛 3-澶辫触
- * @param year
- * @param startTime
- * @param endTime
- * @param out
- */
- @RequestMapping(value = "getLostNum")
- public void getLostNum(String callback, Integer dateType, Integer state, String year, String startTime,
- String endTime, PrintWriter out) {
-
- String validateMsg = validateParams(dateType, startTime, endTime);
- if (validateMsg != null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
- return;
- }
-
- try {
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
-
- List<Map<String, Object>> resultList =lostOrderService.countLostNum(dateType, state, year,
- startTime, endTime);
-
- if (resultList == null) {
- resultList = new ArrayList<Map<String,Object>>();
- }
-
- JSONObject innerList = new JSONObject();
- innerList.put("name", "鏁伴噺");
- innerList.put("data_list", resultList);
-
- JSONArray outList = new JSONArray();
- outList.add(innerList);
-
- JSONObject data = new JSONObject();
- data.put("result_list", outList);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
- e.printStackTrace();
- }
- }
-
- /**
- * 缁熻鐢宠瘔閲戦鎬绘暟
- * @param callback
- * @param dateType 鏄剧ず瑙嗗浘锛氭棩-1 銆佹湀-2銆� 骞�-3
- * @param year
- * @param startTime
- * @param endTime
- * @param out
- */
- @RequestMapping(value = "getAppealMoney")
- public void getAppealMoney(String callback, Integer dateType, String year, String startTime, String endTime,
- PrintWriter out) {
-
- String validateMsg = validateParams(dateType, startTime, endTime);
- if (validateMsg != null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(validateMsg));
- return;
- }
-
- try {
-
- if (dateType != 1 && (!StringUtil.isNullOrEmpty(startTime) || !StringUtil.isNullOrEmpty(endTime))) {
- startTime = null;
- endTime = null;
- }
-
- List<Map<String, Object>> resultList =lostOrderService.countAppealMoney(dateType, year, startTime, endTime);
- if (resultList == null) {
- resultList = new ArrayList<Map<String,Object>>();
- }
-
- JSONObject innerList = new JSONObject();
- innerList.put("name", "閲戦");
- innerList.put("data_list", resultList);
-
- JSONArray outList = new JSONArray();
- outList.add(innerList);
-
- JSONObject data = new JSONObject();
- data.put("result_list", outList);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绯荤粺寮傚父"));
- e.printStackTrace();
- }
- }
}
--
Gitblit v1.8.0