From ffa0eb98e31171c2842b65767a0be542304c1d1e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 02 八月 2019 12:24:50 +0800
Subject: [PATCH] 拼多多分享bug
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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..c20ff87 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,16 +85,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,14 +138,37 @@
@RequestMapping("findLostOrder")
public void findLostOrder(AcceptData acceptData, LostOrder lostOrder, HttpServletRequest request, PrintWriter out) {
+ Integer type = lostOrder.getType();
+ if (type == null) {
+ type = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
boolean orderNum = true;
-
- 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());
+ 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;
+ }
+ }
+ }
+ }
if (lostOrder.getUserInfo() == null || lostOrder.getUserInfo().getId() == null
|| lostOrder.getUserInfo().getId() <= 0) {
--
Gitblit v1.8.0