github/mall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update comment

Browse Source
This commit is contained in:
macro 2019-03-01 13:33:21 +08:00
parent 59eae9d73b
commit d1bdcfdac3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
View File

@ -473,8 +473,8 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
if (useIntegration.compareTo(currentMember.getIntegration()) > 0) { if (useIntegration.compareTo(currentMember.getIntegration()) > 0) {
return zeroAmount; return zeroAmount;
} }
//根据积分使用规则判断使用可用 //根据积分使用规则判断是否可用
//是否可用于优惠券共用 //是否可与优惠券共用
UmsIntegrationConsumeSetting integrationConsumeSetting = integrationConsumeSettingMapper.selectByPrimaryKey(1L); UmsIntegrationConsumeSetting integrationConsumeSetting = integrationConsumeSettingMapper.selectByPrimaryKey(1L);
if (hasCoupon && integrationConsumeSetting.getCouponStatus().equals(0)) { if (hasCoupon && integrationConsumeSetting.getCouponStatus().equals(0)) {
//不可与优惠券共用 //不可与优惠券共用

1
mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java
View File

@ -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)); nativeSearchQueryBuilder.withSort(SortBuilders.scoreSort().order(SortOrder.DESC));
nativeSearchQueryBuilder.withSort(SortBuilders.scoreSort().order(SortOrder.DESC));
NativeSearchQuery searchQuery = nativeSearchQueryBuilder.build(); NativeSearchQuery searchQuery = nativeSearchQueryBuilder.build();
LOGGER.info("DSL:{}", searchQuery.getQuery().toString()); LOGGER.info("DSL:{}", searchQuery.getQuery().toString());
return productRepository.search(searchQuery); return productRepository.search(searchQuery);