Merge branch 'feature/20191119_套餐特价' into develop

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

@@ -532,7 +532,7 @@ public class CouponServiceImpl implements CouponService {
             // 数量
             product.setQuantity(cartGood.getQty());
             productList.add(product);
-            totalAmount = totalAmount + cartGood.getOriginalPrice() * cartGood.getQty();
+            totalAmount = totalAmount +product.getAmount() * cartGood.getQty();
         }
         return totalAmount;
     }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/DefaultPromotionService.java

@@ -113,7 +113,7 @@ public class DefaultPromotionService implements IPromotionService {
 
 
         shoppingCartGoodsDto.setActivityDiscountsDtos(activityDiscountsDtos);
-        if (null != calculationDiscountResult && ((CollectionUtils.isNotEmpty(activityDiscountsDtos) || CollectionUtils.isNotEmpty(addMoneyDiscounts)))) {
+        if (null != calculationDiscountResult) {
             //处理加价购
             List<SubtractStockVO> stocks = filterSendGoodsStocks(calculationDiscountResult.getStocks(), shoppingCartInfoRequestVo, addMoneyDiscounts);
             if (CollectionUtils.isNotEmpty(stocks)) {