From d1bdcfdac3b2c5460f432f59298a2435f84c5367 Mon Sep 17 00:00:00 2001
From: macro <zhenghong1991@126.com>
Date: Fri, 1 Mar 2019 13:33:21 +0800
Subject: [PATCH] update comment

---
 .../mall/portal/service/impl/OmsPortalOrderServiceImpl.java   | 4 ++--
 .../macro/mall/search/service/impl/EsProductServiceImpl.java  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
index 1c0542e..800669f 100644
--- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
+++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
@@ -473,8 +473,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         if (useIntegration.compareTo(currentMember.getIntegration()) > 0) {
             return zeroAmount;
         }
-        //根据积分使用规则判断使用可用
-        //是否可用于优惠券共用
+        //根据积分使用规则判断是否可用
+        //是否可与优惠券共用
         UmsIntegrationConsumeSetting integrationConsumeSetting = integrationConsumeSettingMapper.selectByPrimaryKey(1L);
         if (hasCoupon && integrationConsumeSetting.getCouponStatus().equals(0)) {
             //不可与优惠券共用
diff --git a/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java b/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java
index 5c2e6a3..64ac5c3 100644
--- a/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java
+++ b/mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java
@@ -150,7 +150,6 @@ public class EsProductServiceImpl implements EsProductService {
             nativeSearchQueryBuilder.withSort(SortBuilders.scoreSort().order(SortOrder.DESC));
         }
         nativeSearchQueryBuilder.withSort(SortBuilders.scoreSort().order(SortOrder.DESC));
-        nativeSearchQueryBuilder.withSort(SortBuilders.scoreSort().order(SortOrder.DESC));
         NativeSearchQuery searchQuery = nativeSearchQueryBuilder.build();
         LOGGER.info("DSL:{}", searchQuery.getQuery().toString());
         return productRepository.search(searchQuery);