Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2020-01-01 eed54c262df12dd3d132bf14691915e6183afd4c

 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<>();

         }