From aef1627c767ef3cb697973137843617bf4b943b4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 四月 2020 10:26:04 +0800
Subject: [PATCH] 增加禁止用户等级升级名单
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 db82067..3fbc0ff 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
@@ -16,6 +16,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.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.util.Constant;
@@ -85,7 +86,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 +143,7 @@
if (type == null) {
type = Constant.SOURCE_TYPE_TAOBAO;
}
-
+
boolean orderNum = true;
String orderId = lostOrder.getOrderId();
if (type == Constant.SOURCE_TYPE_TAOBAO) {
@@ -151,7 +152,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 +173,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,7 +198,7 @@
stateInfo = "璇ヨ鍗曠敵璇夊凡澶辫触锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅";
} else if (state == -7) {
stateInfo = "浠婃棩鐢宠瘔娆℃暟宸茶揪涓婇檺";
- }else if (state == -1001) {
+ } else if (state == -1001) {
stateInfo = "璁㈠崟杩濊";
}
}
@@ -209,8 +211,8 @@
@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"));
+ data.put("what", configService.get(ConfigKeyEnum.lostOrderHelpWhat.getKey()));
+ data.put("reason", configService.get(ConfigKeyEnum.lostOrderHelpReason.getKey()));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0