From eda623f37c3260f4b4657e34a8a39798c72432b1 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期日, 28 六月 2020 15:49:14 +0800 Subject: [PATCH] 搜索接口增加小黄条返回 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/LostOrderController.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 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 0b99c7b..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,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)) { // 鐢宠瘔澶辫触 @@ -168,6 +169,14 @@ } } } + } 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 @@ -210,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