From 41a4f9aa848255b97b4ad2bd76cb2dfa177df609 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期五, 16 十一月 2018 17:40:14 +0800
Subject: [PATCH] 后台导航栏管理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java
index 907bac5..2e45756 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java
@@ -14,6 +14,7 @@
import com.google.gson.Gson;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.LostOrder;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
@@ -34,6 +35,9 @@
@Resource
private LostOrderService lostOrderService;
+
+ @Resource
+ private ConfigService configService;
/**
* 鑾峰彇鍔ㄦ�佹帹鑽�
@@ -69,13 +73,14 @@
json.remove("remake");
json.remove("judge");
- json.put("createTime", TimeUtil.getGernalTime(order.getCreateTime(), "yyyy-MM-dd HH:mm"));
- if (order.getState() == 1 && order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
+ json.put("createTime", TimeUtil.getGernalTime(order.getCreateTime(), "yyyy.MM.dd HH:mm"));
+ if (order.getState() == 1 && order.getResultCode() != null
+ && order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
// 鐢宠瘔鎴愬姛
json.put("state", 1);
json.put("stateDesc", "鐢宠瘔鎴愬姛锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅");
- } else if (order.getState() == 2
- || (order.getState() == 1 && order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {
+ } else if (order.getState() == 2 || (order.getState() == 1 && order.getResultCode() != null
+ && order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {
// 鐢宠瘔澶辫触
json.put("state", 2);
json.put("stateDesc", "鐢宠瘔澶辫触");
@@ -100,7 +105,7 @@
return;
}
LostOrder lostOrder = lostOrderService.getOne(id);
- if (lostOrder != null && lostOrder.getUserInfo().getId() == uid) {
+ if (lostOrder != null && lostOrder.getUserInfo().getId() == uid.longValue()) {
lostOrderService.deleteLostOrder(id);
out.print(JsonUtil.loadTrueResult(""));
} else {
@@ -131,7 +136,7 @@
if (lostOrder.getUserInfo() == null || lostOrder.getUserInfo().getId() == null
|| lostOrder.getUserInfo().getId() <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛灏氭湭鐧诲綍"));
+ out.print(JsonUtil.loadFalseResult(1, "璇风櫥褰曡繑鍒╁埜璐﹀彿"));
return;
}
@@ -139,17 +144,18 @@
String stateInfo = "鎻愪氦鎴愬姛锛岃绛夊緟瀹℃牳缁撴灉銆�";
if (!orderNum) {
state = -4;
- stateInfo = "璇锋彁浜ゆ爣鍑嗙殑璁㈠崟鍙�";
+ stateInfo = "璇锋彁浜ゅ噯纭殑璁㈠崟鍙�";
} else {
+ lostOrder.setResultCode(LostOrder.RESULT_CODE_VERFING);
state = lostOrderService.addLostOrder(lostOrder);
if (state == -3) {
- stateInfo = "璇ヨ鍗曞凡鏄繑鍒╄鍗曘��";
+ stateInfo = "璇ヨ鍗曞凡琚粺璁★紝鏃犻渶鐢宠瘔銆�";
} else if (state == -2) {
- stateInfo = "璇峰嬁閲嶅鎻愪氦,璇ヨ鍗曞凡鍦ㄥ鏍镐腑銆�";
+ stateInfo = "璇峰嬁閲嶅鎻愪氦,璇ヨ鍗曟鍦ㄥ鏍镐腑銆�";
} else if (state == -1) {
- stateInfo = "璇ヨ鍗曠敵璇夊凡閫氳繃锛岃绋嶅悗鏌ョ湅銆�";
+ stateInfo = "璇ヨ鍗曠敵璇夊凡閫氳繃锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅銆�";
} else if (state == -5) {
- stateInfo = "璇ヨ鍗曚负鍒嗕韩濂栭噾璁㈠崟";
+ stateInfo = "鍒嗕韩濂栭噾璁㈠崟鏃犻渶鐢宠瘔";
}
}
JSONObject data = new JSONObject();
@@ -158,4 +164,12 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ @RequestMapping("getConfig")
+ public void getConfig(AcceptData acceptData, PrintWriter out) {
+ JSONObject data = new JSONObject();
+ data.put("what", configService.get("lost_order_help_what"));
+ data.put("reason", configService.get("lost_order_help_reason"));
+ out.print(JsonUtil.loadTrueResult(data));
+ }
+
}
--
Gitblit v1.8.0