Merge branches 'feature/20210811_券优惠金额调整_wuping' and 'qa' of…

Merge branches 'feature/20210811_券优惠金额调整_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -96,6 +96,11 @@ public class CouponPromotionService implements IPromotionService {
             List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults> couponResultsList = calculationDiscountResult.getCouponDiscounts();
             if (CollectionUtils.isNotEmpty(couponResultsList)) {
                 for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.CouponResults couponResults : couponResultsList) {
+                    //前端计算小计拿商品现价累计减couponDiscount，商品券换购券现价已排除
+                    if(ActivityTypeEnum.TYPE_33.getCode()== couponResults.getActivityType()
+                            || ActivityTypeEnum.TYPE_32.getCode()== couponResults.getActivityType()){
+                        continue;
+                    }
                     couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
                 }
             }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

@@ -304,6 +304,11 @@ public class CouponDiscountCalculation {
         long couponDiscount = 0;
         if (CollectionUtils.isNotEmpty(couponDiscounts)) {
             for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount couponResults : couponDiscounts) {
+                //前端计算小计拿商品现价累计减couponDiscount，商品券换购券现价已排除
+                if(ActivityTypeEnum.TYPE_33.getCode()== couponResults.getType()
+                        || ActivityTypeEnum.TYPE_32.getCode()== couponResults.getType()){
+                    continue;
+                }
                 couponDiscount = couponDiscount + (couponResults.getDiscount() == null ? 0 : couponResults.getDiscount());
             }
         }