From 1b3856e8f5431508d944a3b9c7a444dac3536bb6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 07 一月 2020 18:14:18 +0800
Subject: [PATCH] cofig
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index 2b3082d..54c039d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -14,10 +14,12 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.NumberUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.ESOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -110,7 +112,7 @@
// 鎼滅储鍐呭銆佽鍗曞彿
if (!StringUtil.isNullOrEmpty(orderNo) && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
- searchOrder(orderNo, page, uid, out);
+ searchOrder(acceptData, orderNo, page, uid, out);
return;
}
@@ -220,14 +222,14 @@
String orderFindUrl = null;
if (state ==null && page == 1) {
if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4)||count==0L) {
- orderFindUrl = configService.get("order_find_notify_url");
+ orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());
}
}
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
- data.put("helpUrl", configService.get("order_list_help"));
+ data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
data.put("validMoney", "楼 " + validMoney);
data.put("invalidMoney", "楼 " + invalidMoney);
data.put("findOrderHelpUrl", orderFindUrl);
@@ -245,15 +247,22 @@
* @param key
* @param out
*/
- private void searchOrder(String key, Integer page, Long uid, PrintWriter out) {
+ private void searchOrder(AcceptData acceptData, String key, Integer page, Long uid, PrintWriter out) {
try {
long count = 0;
List<CommonOrderVO> list = null;
- List<ESOrder> listES = esOrderService.query(key, uid.toString(), null);
+ if (NumberUtil.isNumeric(key.replace("-", ""))) {
+ list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null, null);
+ }
- if (listES.size() != 0) {
- list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
- count = commonOrderService.countSearchOrderByUid(uid, listES);
+ if (list == null || list.size() == 0) {
+ List<ESOrder> listES = esOrderService.query(key, uid.toString(), null);
+ if (listES.size() != 0) {
+ list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
+ count = commonOrderService.countSearchOrderByUid(uid, listES);
+ }
+ } else {
+ count = list.size();
}
if (list == null) {
--
Gitblit v1.8.0