From ffd6563902758e7509d1acde4ad2fdf0bfd235fe Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 20 十一月 2018 18:20:43 +0800
Subject: [PATCH] Merge branch 'master' of ssh://yujian@193.112.35.168:29418/fanli-server.git
---
fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 3ab3d69..1804bb9 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
@@ -152,7 +152,7 @@
}
int state;
- String stateInfo = "鎻愪氦鎴愬姛锛岃绛夊緟瀹℃牳缁撴灉銆�";
+ String stateInfo = "鎻愪氦鎴愬姛锛岃绛夊緟瀹℃牳缁撴灉";
if (!orderNum) {
state = -4;
stateInfo = "璇锋彁浜ゅ噯纭殑璁㈠崟鍙�";
@@ -160,13 +160,15 @@
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 = "璇ヨ鍗曠敵璇夊凡澶辫触锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅";
}
}
JSONObject data = new JSONObject();
--
Gitblit v1.8.0