Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wwwanlingxiao
mall
Commits
d1bdcfda
Commit
d1bdcfda
authored
Mar 01, 2019
by
macro
Browse files
update comment
parent
59eae9d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
mall-portal/src/main/java/com/macro/mall/portal/service/impl/OmsPortalOrderServiceImpl.java
View file @
d1bdcfda
...
...
@@ -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
))
{
//不可与优惠券共用
...
...
mall-search/src/main/java/com/macro/mall/search/service/impl/EsProductServiceImpl.java
View file @
d1bdcfda
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment