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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 1804bb9..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;
@@ -135,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())) {
@@ -150,7 +152,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇风櫥褰曡繑鍒╁埜璐﹀彿"));
return;
}
-
+ lostOrder.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
int state;
String stateInfo = "鎻愪氦鎴愬姛锛岃绛夊緟瀹℃牳缁撴灉";
if (!orderNum) {
@@ -169,6 +171,8 @@
stateInfo = "鍒嗕韩濂栭噾璁㈠崟鏃犻渶鐢宠瘔";
} else if (state == -6) {
stateInfo = "璇ヨ鍗曠敵璇夊凡澶辫触锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅";
+ } else if (state == -7) {
+ stateInfo = "浠婃棩鐢宠瘔娆℃暟宸茶揪涓婇檺";
}
}
JSONObject data = new JSONObject();
--
Gitblit v1.8.0