套餐商品券原价展示问题修改

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

@@ -772,6 +772,10 @@ public class CouponServiceImpl implements CouponService {
             dto.setTodayAvailableTimes(1);
         }
         dto.setPrice(productsVo.getFinalPrice());
+        //套餐商品券优惠金额处理
+        if(requestDto.getAddCartGoods() != null && CollectionUtils.isNotEmpty(requestDto.getAddCartGoods().getProductComboList())){
+            dto.setPrice(productsVo.getOriginalPrice());
+        }
         dto.setSpuId(productsVo.getSpuId());
         dto.setSpuName(productsVo.getSkuName());
         dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
@@ -833,6 +837,16 @@ public class CouponServiceImpl implements CouponService {
         ValidateShopProductType productType = new ValidateShopProductType();
 
         productType.setAttributeList(null);
+        productType.setMemberDiscount(null);
+        productType.setPrice(product.getFinalPrice().intValue());
+        productType.setProductGroupTypeList(null);
+        productType.setSkuId(product.getSkuId());
+        productType.setSpuId(product.getSpuId());
+        productType.setUuid(UUID.randomUUID().toString());
+        productType.setValidateAttribute(0);
+        productType.setValidatePrice(0);
+        productType.setValidateStatuses(null);
+
         if(requestDto.getAddCartGoods() != null && CollectionUtils.isNotEmpty(requestDto.getAddCartGoods().getProductComboList())){
             List<ValidateSkuProductType> comboProductTypeList = new ArrayList<>();
             for (CartGoods.ComboxGoods comboxGoods : requestDto.getAddCartGoods().getProductComboList()){
@@ -853,16 +867,8 @@ public class CouponServiceImpl implements CouponService {
             }
             productType.setComboProductTypeList(comboProductTypeList);
             productType.setIsCouponMarkUpSetMeal(1);
+            productType.setPrice(product.getOriginalPrice().intValue());
         }
-        productType.setMemberDiscount(null);
-        productType.setPrice(product.getFinalPrice().intValue());
-        productType.setProductGroupTypeList(null);
-        productType.setSkuId(product.getSkuId());
-        productType.setSpuId(product.getSpuId());
-        productType.setUuid(UUID.randomUUID().toString());
-        productType.setValidateAttribute(0);
-        productType.setValidatePrice(0);
-        productType.setValidateStatuses(null);
 
         productTypeList.add(productType);
         request.setProductTypeList(productTypeList);