From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
index c20ff87..26e9653 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java
@@ -85,7 +85,7 @@
&& order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {
// 鐢宠瘔鎴愬姛
json.put("state", 1);
- json.put("stateDesc", "璁㈠崟鎵惧洖鎴愬姛锛岃鎴戠殑-璁㈠崟涓煡鐪�");
+ json.put("stateDesc", "璁㈠崟鎵惧洖鎴愬姛锛岃鍒版垜鐨�-璁㈠崟涓煡鐪�");
} else if (order.getState() == 2 || (order.getState() == 1 && order.getResultCode() != null
&& order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {
// 鐢宠瘔澶辫触
@@ -142,7 +142,7 @@
if (type == null) {
type = Constant.SOURCE_TYPE_TAOBAO;
}
-
+
boolean orderNum = true;
String orderId = lostOrder.getOrderId();
if (type == Constant.SOURCE_TYPE_TAOBAO) {
@@ -151,7 +151,7 @@
} else {
orderNum = Utils.isOrderNum(orderId);
}
- } else if (type == Constant.SOURCE_TYPE_JD) {
+ } else if (type == Constant.SOURCE_TYPE_JD) {
if (!NumberUtil.isNumeric(orderId) || (orderId.length() < 6 || orderId.length() > 20)) {
orderNum = false;
}
@@ -172,7 +172,8 @@
if (lostOrder.getUserInfo() == null || lostOrder.getUserInfo().getId() == null
|| lostOrder.getUserInfo().getId() <= 0) {
- out.print(JsonUtil.loadFalseResult(1, "璇风櫥褰曡繑鍒╁埜璐﹀彿"));
+ out.print(JsonUtil.loadFalseResult(1,
+ String.format("璇风櫥褰�%s璐﹀彿", Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()))));
return;
}
lostOrder.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
@@ -196,6 +197,8 @@
stateInfo = "璇ヨ鍗曠敵璇夊凡澶辫触锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅";
} else if (state == -7) {
stateInfo = "浠婃棩鐢宠瘔娆℃暟宸茶揪涓婇檺";
+ } else if (state == -1001) {
+ stateInfo = "璁㈠崟杩濊";
}
}
JSONObject data = new JSONObject();
--
Gitblit v1.8.0