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 | 80 +++++++++++++++-------------------------
1 files changed, 30 insertions(+), 50 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 d611d32..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
@@ -6,8 +6,6 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -20,7 +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 net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/lostOrder")
@@ -29,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
@@ -81,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;
@@ -93,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;
@@ -102,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 {
@@ -119,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);
@@ -214,4 +193,5 @@
}
}
+
}
--
Gitblit v1.8.0