From d029dafc262bc3c8ddc8ca6b85e4fa6e073d764a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 一月 2020 14:38:47 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 fe8f074..486dc1d 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
@@ -244,11 +244,13 @@
try {
long count = 0;
List<CommonOrderVO> list = null;
- List<ESOrder> listES = esOrderService.multiMatchQuery(key, uid.toString());
+ List<ESOrder> listES = esOrderService.query(key, uid.toString());
+
if (listES.size() != 0) {
list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES);
count = commonOrderService.countSearchOrderByUid(uid, listES);
}
+
if (list == null) {
list = new ArrayList<>();
}
--
Gitblit v1.8.0