Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa

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

@@ -78,11 +78,16 @@ public class CalculationSharingDiscountService {
             }
             else {//商品券->商品券ID换取商品
                 String spqId = cartGoods.getCartGoodsUid().substring(CommonsConstant.COUPON_PREFIX.length());
-                CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spqId,menuType);
-                CheckSpqInfoResponseDto checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
-                if (null==checkSpqInfo) {
+                CheckSpqInfoRequestDto checkSpqInfoRequestDto = new CheckSpqInfoRequestDto(partnerId, storeId, spqId, menuType);
+                CheckSpqInfoResponseDto checkSpqInfo = null;
+                if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
+                    checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto, cartGoods.getSkuId());
+                } else {
+                    checkSpqInfo = couponService.checkSpqInfo(checkSpqInfoRequestDto);
+                }
+                if (null == checkSpqInfo) {
                     cartGoodsList.remove(i);
-                    assortmentSdkService.setShoppingCart(partnerId,storeId,userId,cartGoodsList,null,null,this.shoppingCartBaseService);
+                    assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, null, null, this.shoppingCartBaseService);
                     //跑业务异常 商品券不存
                     if (GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
                         throw new ServiceException(ResponseResult.SHOPPING_CART_HG_COUPON_NOT_EXIST);