Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'qa' of…

Merge branches 'feature/20211018_商品券支持套餐_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/CouponServiceImpl.java

@@ -979,7 +979,6 @@ public class CouponServiceImpl implements CouponService {
         dto.setActiveCode(couponActivityDetail.getActive().getActiveCode());
         dto.setCouponName(couponActivityDetail.getTitle());
         dto.setActivityName(couponActivityDetail.getActive().getActiveName());
-        dto.setPrice(productsVo.getFinalPrice());
         dto.setSpuId(productsVo.getSpuId());
         dto.setSpuName(productsVo.getSkuName());
         dto.setSkuId(productsVo.getSkuId());
@@ -990,6 +989,11 @@ public class CouponServiceImpl implements CouponService {
         dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setExtras(productsVo.getExtra());
         dto.setCouponType(couponType);
+        dto.setPrice(productsVo.getFinalPrice());
+        //套餐商品券优惠金额处理
+        if(requestDto.getAddCartGoods() != null && CollectionUtils.isNotEmpty(requestDto.getAddCartGoods().getProductComboList())){
+            dto.setPrice(productsVo.getOriginalPrice());
+        }
 
         List<ValiadShopProductResult> successList = valiadProductResponse.getData().getSuccessList();
         dto.setProductBeans(successList.get(0).getProductType());