From 5bc52270df206bbb2df656247991889529aeda8b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 16:31:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 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 7fc5c4c..d827528 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,16 +86,16 @@
&& 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)) {
// 鐢宠瘔澶辫触
json.put("state", 2);
- json.put("stateDesc", "鐢宠瘔澶辫触");
+ json.put("stateDesc", "璁㈠崟鎵惧洖澶辫触");
} else {
// 澶勭悊涓�
json.put("state", 0);
- json.put("stateDesc", "瀹℃牳涓�");
+ json.put("stateDesc", "璁㈠崟鎵惧洖涓�");
}
data.add(json);
}
@@ -138,18 +139,50 @@
@RequestMapping("findLostOrder")
public void findLostOrder(AcceptData acceptData, LostOrder lostOrder, HttpServletRequest request, PrintWriter out) {
- boolean orderNum = true;
+ Integer type = lostOrder.getType();
+ if (type == null) {
+ type = Constant.SOURCE_TYPE_TAOBAO;
+ }
- if (!NumberUtil.isNumeric(lostOrder.getOrderId())) {
- orderNum = false;
- } else if (lostOrder.getOrderId().length() < 12 || lostOrder.getOrderId().length() > 20) {
- orderNum = false;
- } else
- orderNum = Utils.isOrderNum(lostOrder.getOrderId());
+ boolean orderNum = true;
+ String orderId = lostOrder.getOrderId();
+ if (type == Constant.SOURCE_TYPE_TAOBAO) {
+ if (!NumberUtil.isNumeric(orderId) || (orderId.length() < 12 || orderId.length() > 20)) {
+ orderNum = false;
+ } else {
+ orderNum = Utils.isOrderNum(orderId);
+ }
+ } else if (type == Constant.SOURCE_TYPE_JD) {
+ if (!NumberUtil.isNumeric(orderId) || (orderId.length() < 6 || orderId.length() > 20)) {
+ orderNum = false;
+ }
+ } else if (type == Constant.SOURCE_TYPE_PDD) {
+ if (!orderId.contains("-")) {
+ orderNum = false;
+ } else {
+ String[] split = orderId.split("-");
+ if (split == null || split.length != 2) {
+ orderNum = false;
+ } else {
+ if (!NumberUtil.isNumeric(split[0]) || !NumberUtil.isNumeric(split[1])) {
+ orderNum = false;
+ }
+ }
+ }
+ } else if (type == Constant.SOURCE_TYPE_VIP) {
+ if (!NumberUtil.isNumeric(orderId) || (orderId.length() < 10 || orderId.length() > 18)) {
+ orderNum = false;
+ }
+ } else if (type == Constant.SOURCE_TYPE_SUNING) {
+ if (!NumberUtil.isNumeric(orderId) || (orderId.length() < 10 || orderId.length() > 15)) {
+ orderNum = false;
+ }
+ }
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());
@@ -173,6 +206,8 @@
stateInfo = "璇ヨ鍗曠敵璇夊凡澶辫触锛岃鍦ㄨ鍗曞垪琛ㄤ腑鏌ョ湅";
} else if (state == -7) {
stateInfo = "浠婃棩鐢宠瘔娆℃暟宸茶揪涓婇檺";
+ } else if (state == -1001) {
+ stateInfo = "璁㈠崟杩濊";
}
}
JSONObject data = new JSONObject();
@@ -184,8 +219,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