优惠力度 显示 加上 配送券优惠金额

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java

@@ -415,7 +415,6 @@ public class ActivityAdapter {
         couponAvailableCartInfo.setProviderId(partnerId);
         couponAvailableCartInfo.setMerchantId(partnerId);
         couponAvailableCartInfo.setStoreId(storeId);
-        couponAvailableCartInfo.setChannelIdList(orgCodes);
         couponAvailableCartInfo.setExclusion(true);
 
         Long totalMealDiscountAmount = 0L;//套餐优惠不算在内

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

@@ -7,17 +7,10 @@ import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ActivityQueryDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
-import cn.freemud.entities.vo.CartGoods;
-import cn.freemud.entities.vo.CouponPromotionVO;
-import cn.freemud.entities.vo.CreateOrderVo;
-import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
-import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.ActivityTypeEnum;
-import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.service.IPromotionService;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,7 +20,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * All rights Reserved, Designed By www.freemud.com
@@ -66,7 +58,20 @@ public class DefaultPromotionService implements IPromotionService {
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(calculationDiscountResult == null ? totalOriginalAmount : calculationDiscountResult.getOriginalTotalAmount());
         shoppingCartGoodsResponseVo.setTotalAmount(calculationDiscountResult == null ? totalAmount : calculationDiscountResult.getTotalAmount());
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
-        shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscountResult == null ? 0L : calculationDiscountResult.getTotalDiscountAmount());
+        if (calculationDiscountResult == null) {
+            shoppingCartGoodsResponseVo.setTotalDiscountAmount(0L);
+        }else {
+            // 需要算上配送券的优惠金额
+            Integer discountAmount = 0;
+            if (CollectionUtils.isNotEmpty(calculationDiscountResult.getCouponDiscounts())) {
+                // 过滤出配送券金额
+                ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults = calculationDiscountResult.getCouponDiscounts().stream().filter(c -> c.getActivityType() != null && c.getActivityType().compareTo(ActivityTypeEnum.TYPE_34.getCode()) == 0).findFirst().orElse(null);
+                if (couponResults != null) {
+                    discountAmount = couponResults.getDiscountAmount();
+                }
+            }
+            shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscountResult.getTotalDiscountAmount() + discountAmount);
+        }
     }
 
     @Override