瀏覽代碼

update comment

macro 6 年之前
父節點
當前提交
d1bdcfdac3

+ 2 - 2
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)) {
             //不可与优惠券共用

+ 0 - 1
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);