Merge branch '2020/11/2-商品券bug-huiyang' into qa

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

@@ -169,7 +169,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         }
 
         //商品券已添加情况校验
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId);
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId, addShoppingCartGoodsRequestVo);
         CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId ,vo);
         setClassificationAndPrice(addCartGoods, productBeanListSpuClass);
         if(StringUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getGroupName())) {
@@ -222,7 +222,7 @@ public class ShoppingCartMCoffeeServiceImpl {
     }
 
 
-    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode,String goodsId) {
+    private List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> checkGoodsCoupon(List<CartGoods> oldCartGoodsList, Integer operationType, String couponCode, String goodsId, MCoffeeAddGoodsRequestVo addShoppingCartGoodsRequestVo) {
         if (operationType != null && operationType == 1 && StringUtils.isBlank(couponCode)) {
             throw new ServiceException(ResponseResult.PARAMETER_MISSING, "商品券券号为空");
         }
@@ -243,6 +243,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                     cartGoods.setQty(0);
                 }
                 if (StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && goodsId.equals(cartGoods.getSkuId()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
+                    // 如果购物车商品存在商品规格，替换时复制规格信息
+                    if (CollectionUtils.isNotEmpty(cartGoods.getSpecialExtra())) {
+                        addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getSpecialExtra());
+                    }
                     if (cartGoods.getQty() > 1 ){
                         cartGoods.setQty(cartGoods.getQty() - 1);
                     }else {