fix:换购

8d53ffc2 · xiaoer.li@freemud.com · fcfaba6c · 8d53ffc2
Commit 8d53ffc2 authored Jun 15, 2020 by xiaoer.li@freemud.com
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CustomerScoreService.java
+2 -1

No files found.
--- a/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CustomerScoreService.java
+++ b/shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CustomerScoreService.java
@@ -84,7 +84,8 @@ public class CustomerScoreService implements IPromotionService {
                        }
                    }
                    //积分抵扣开关禁用 过滤换购
-                    if (type81 == 0 || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))) {
+                    if (type81 == 0 || (type81 == 1 && !CollectionUtils.isEmpty(shoppingCartInfoRequestVo.getSendGoods()))
+                            || (type81 == 1 && calculationDiscountResult.getDiscounts().size() > 1)) {
                        customerScoreVo.setScoreReduceState(5);
                        userScoreUseDetail.getResult().setScoreState(5);
                        discountAmount = 0;