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

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

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/PayStatusEnum.java

@@ -21,7 +21,7 @@ public enum PayStatusEnum {
     HAVE_PAID(2, "已支付"),
     HAVE_REFUND(3, "已退款"),
     HAVE_PART_REFUND(4, "已经部分退款"),
-    COMPLETE(5, "完成");
+    ;
 
 
     private Integer code;

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);