From be67478cae6bf9308f15949a21e7d0a57a3f0ecb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 16 七月 2020 15:37:31 +0800
Subject: [PATCH] dubbo集成修改
---
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 26e9653..958eaba 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,10 +16,11 @@
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;
-import com.yeshi.fanli.util.TimeUtil;
+import org.yeshi.utils.TimeUtil;
import com.yeshi.fanli.util.Utils;
import net.sf.json.JSONArray;
@@ -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.getValue(ConfigKeyEnum.lostOrderHelpWhat.getKey(),acceptData.getSystem()));
+ data.put("reason", configService.getValue(ConfigKeyEnum.lostOrderHelpReason.getKey(),acceptData.getSystem()));
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0