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

Merge branches 'feature/20211018_商品券支持套餐_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

@@ -111,7 +111,7 @@ public class CalculationSharingDiscountService {
                     checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
                     viewProductName = true;
                 } else {
-                    checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto,null);
+                    checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto,cartGoods.getSkuId());
                 }
                 if (null == checkSpqInfo) {
                     cartGoodsList.remove(i);