Merge branch 'developerB' into developer

src/main/java/com/caimei365/commodity/components/SearchOpenService.java

@@ -136,11 +136,13 @@ public class SearchOpenService {
 
         // 创建sort对象，并设置二维排序
         Sort sorter = new Sort();
-        sorter.addToSortFields(new SortField("a_publish_date", Order.DECREASE));//1.2.8版本根据时间排序
         if (StringUtils.isNotEmpty(sortField)) {
             Order order = (1 == sortType) ? Order.DECREASE : Order.INCREASE;
             // 设置排序字段
             sorter.addToSortFields(new SortField(sortField, order));
+        }else{
+            //走时间排序
+            sorter.addToSortFields(new SortField("a_publish_date", Order.DECREASE));//1.2.8版本根据时间排序
         }
         // 以RANK相关性算分降序
         sorter.addToSortFields(new SortField("RANK", Order.DECREASE));

src/main/java/com/caimei365/commodity/service/impl/SearchQueryServiceImpl.java

@@ -345,7 +345,14 @@ public class SearchQueryServiceImpl implements SearchQueryService {
         summaryField2.put("field", "a_intro");
         summaryList.add(summaryField2);
         // 阿里云搜索
-        ResponseJson<String> result = queryArticleForParams(queryStr, fetchFields, summaryList, pageNum, pageSize, null, 1);
+        ResponseJson<String> result=null;
+        if(status==1){
+            //综合排序
+            result=queryArticleForParams(queryStr, fetchFields, summaryList, pageNum, pageSize, null, 1);
+        }else{
+            //时间排序
+            result=queryArticleForParams(queryStr, fetchFields, summaryList, pageNum, pageSize, status.toString(), 1);
+        }
         if (0 == result.getCode()) {
             return result;
         } else {