From 8cb7ec4a35a38ae91d0eed17cde711e81d2b2bbf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:37:49 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 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 2e45756..68e1e76 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
@@ -4,10 +4,12 @@
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
@@ -48,9 +50,14 @@
* @param out
*/
@RequestMapping(value = "getLostOrderList", method = RequestMethod.POST)
- public void getLostOrderList(AcceptData acceptData, Long uid, int page, PrintWriter out) {
+ public void getLostOrderList(AcceptData acceptData, Long uid, Integer page, PrintWriter out) {
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ if (page == null || page <= 0) {
+ out.print(JsonUtil.loadFalseResult(1, "page鏍煎紡閿欒"));
return;
}
@@ -99,7 +106,13 @@
}
@RequestMapping(value = "deleteLostOrder", method = RequestMethod.POST)
- public void deleteLostOrder(AcceptData acceptData, Long uid, long id, PrintWriter out) {
+ public void deleteLostOrder(AcceptData acceptData, Long uid, Long id, PrintWriter out) {
+
+ if (id == null || id <= 0) {
+ out.print(JsonUtil.loadFalseResult(1, "璇烽�夋嫨鍒犻櫎椤�"));
+ return;
+ }
+
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
@@ -124,7 +137,7 @@
}
@RequestMapping("findLostOrder")
- public void findLostOrder(AcceptData acceptData, LostOrder lostOrder, PrintWriter out) {
+ public void findLostOrder(AcceptData acceptData, LostOrder lostOrder, HttpServletRequest request, PrintWriter out) {
boolean orderNum = true;
if (!NumberUtil.isNumeric(lostOrder.getOrderId())) {
@@ -139,9 +152,9 @@
out.print(JsonUtil.loadFalseResult(1, "璇风櫥褰曡繑鍒╁埜璐﹀彿"));
return;
}
-
+ lostOrder.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
int state;
- String stateInfo = "鎻愪氦鎴愬姛锛岃绛夊緟瀹℃牳缁撴灉銆�";
+ String stateInfo = "鎻愪氦鎴愬姛锛岃绛夊緟瀹℃牳缁撴灉";
if (!orderNum) {
state = -4;
stateInfo = "璇锋彁浜ゅ噯纭殑璁㈠崟鍙�";
@@ -149,13 +162,17 @@
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 = "鍒嗕韩濂栭噾璁㈠崟鏃犻渶鐢宠瘔";
+ } else if (state == -6) {
+ stateInfo = "璇ヨ鍗曠敵璇夊凡澶辫触锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅";
+ } else if (state == -7) {
+ stateInfo = "浠婃棩鐢宠瘔娆℃暟宸茶揪涓婇檺";
}
}
JSONObject data = new JSONObject();
--
Gitblit v1.8.0