Merge branch 'feature-yu.sun-checkCartInfoAboutCoupon-20201105' into develop

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.2-SNAPSHOT</version>
 
     <dependencies>
         <dependency>
@@ -55,7 +55,6 @@
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>sdk-common-base</artifactId>
             <version>1.5.2.RELEASE</version>
-<!--            <version>1.4.4-SNAPSHOT</version>-->
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java

@@ -52,6 +52,11 @@ public class ShoppingCartConstant {
     public static final String CART_PRODUCT_INVALID_STATE = "您选择的【$spuName】商品已失效;";
 
     /**
+     * 优惠券不满足使用条件
+     */
+    public static final String COUPON_IS_DISABLE = "您选择的【$couponName】不满足使用条件";
+
+    /**
      * 必选商品组无勾选商品
      */
     public static final int PRODUCT_GROUP_EMPTY= 109;

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -67,6 +67,10 @@ public class CartGoods {
      * 商品券code
      */
     private String couponCode;
+    /**
+     * 商品券名称
+     */
+    private String couponName;
 
     private String spuId;
     private String skuId;

shopping-cart-application-service/pom.xml

@@ -45,7 +45,8 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>2.0.1-SNAPSHOT</version>
+<!--            <version>1.1.5.RELEASE</version>-->
+            <version>2.0.2-SNAPSHOT</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>

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

@@ -1479,20 +1479,24 @@ public class ShoppingCartMCoffeeServiceImpl {
                 List<String> invalidSpu = new ArrayList<>();
                 List<String> notFoundSpu = new ArrayList<>();
                 List<String> changePriceSpu = new ArrayList<>();
+                List<String> disableCoupon = new ArrayList<>();
                 for (int i = 0; i < validateResult.getFailureList().size(); i++) {
                     checkCartRequest.getShoppingCartGoodsResponseVo().setChanged(true);
                     ValiadShopProductResult validaProduct = validateResult.getFailureList().get(i);
                     for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                         if (cartGoods.getSkuId().equals(validaProduct.getSkuId())) {
                             String spuName = null == validaProduct.getProductType() ? cartGoods.getSpuName() : validaProduct.getProductType().getName();
+                            String couponName = StringUtils.isNotEmpty(cartGoods.getCouponName()) ? cartGoods.getCouponName() : "";
                             if (PRODUCT_DOWN == validaProduct.getCode()) {
                                 invalidSpu.add(spuName);
+                                disableCoupon.add(couponName);
                                 cartGoodsStates.setHasInvalidGoods(true);
                                 cartGoods.setCartGoodsUid(null);
                                 break;
                             }
                             if (PRODUCT_NOTFOUND == validaProduct.getCode()) {
                                 notFoundSpu.add(spuName);
+                                disableCoupon.add(couponName);
                                 cartGoodsStates.setHasInvalidGoods(true);
                                 cartGoods.setCartGoodsUid(null);
                                 break;
@@ -1523,6 +1527,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                     toastMsg = toastMsg.concat(CART_PRODUCT_PRICE_CHANGE.replace("$spuName",StringUtils.join(changePriceSpu,",")));
                 }
 
+                if (CollectionUtils.isNotEmpty(disableCoupon)){
+                    toastMsg = toastMsg.concat(COUPON_IS_DISABLE.replace("$couponName",StringUtils.join(disableCoupon,",")));
+                }
+
                 checkCartRequest.getShoppingCartGoodsResponseVo().setToastMsg(toastMsg);
 
                 setToastMsgIfNotExist(checkCartRequest.getShoppingCartGoodsResponseVo(), com.freemud.sdk.api.assortment.shoppingcart.constant.ShoppingCartConstant.SHOPPING_CART_GOODS_CHANGE);