Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -91,7 +91,7 @@ public enum ResponseResult {
     SHOPPING_CART_COUPON_CAN_NOT_USE("44024", "商品券不可用"),
     SHOPPING_CART_LIMIT_ADD("44025", "加购数量超过限制"),
     SHOPPING_CART_GOODS_CHECK_ERROR("44026", "当前餐盘中没有可用券的饮品"),
-
+    SHOPPING_CART_HG_COUPON_NOT_EXIST("44027", "换购券不存在"),
     /**
      * 订单状态码
      */

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

@@ -149,7 +149,7 @@ public interface ShoppingCartNewService {
         CouponService couponService = SDKCommonBaseContextWare.getBean(CouponService.class);
         CheckSpqInfoResponseDto checkSpqInfoResponseDto = couponService.checkSpqInfo(checkSpqInfoRequestDto, goodsId);
         if (checkSpqInfoResponseDto == null) {
-            throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_NOT_EXIST);
+            throw new ServiceException(ResponseResult.SHOPPING_CART_HG_COUPON_NOT_EXIST);
         }
         productIds.add(Long.parseLong(checkSpqInfoResponseDto.getSkuId()));
         spuId2 = checkSpqInfoResponseDto.getSkuId();