Commit be20d9db by xiaoer.li@freemud.com

非换购过滤掉集点

parent ddeabfe8
...@@ -97,7 +97,7 @@ public class CustomerScoreService implements IPromotionService { ...@@ -97,7 +97,7 @@ public class CustomerScoreService implements IPromotionService {
//积分抵扣开关禁用 有换购活动 且选中了换购商品 //积分抵扣开关禁用 有换购活动 且选中了换购商品
// - 有换购且选中了换购商品 // - 有换购且选中了换购商品
// - 有换购且没有选中换购商品 且除集点以外还有其他促销 // - 有换购且没有选中换购商品 且除集点以外还有其他促销
if (type81 == 0 if ((type81 == 0 && discountCount >= 1)
|| (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods())) || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))
|| (type81 == 1 && discountCount > 1)) { || (type81 == 1 && discountCount > 1)) {
customerScoreVo.setScoreReduceState(5); customerScoreVo.setScoreReduceState(5);
......
Markdown is supported
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