Commit d1bdcfda authored by macro's avatar macro
Browse files

update comment

parent 59eae9d7
......@@ -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)) {
//不可与优惠券共用
......
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment