Merge branch 'feature/20201216_切换门店清除代金券缓存_yu.sun' into master_back

assortment-shoppingcart-sdk/pom.xml

@@ -10,8 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>1.1.8.RELEASE</version>
-
+    <version>2.0.15-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -127,6 +127,17 @@ public interface ShoppingCartBaseService {
     default BaseResponse clearMCCafe(CartParamDto cartParamDto, String trackingNo) {
         return null;
     }
+
+
+    /**
+     * 麦咖啡根据券类型 和用户信息清除指定券缓存
+     *
+     * @param cartParamDto
+     */
+    default BaseResponse clearMCCafeCouponByType(CartParamDto cartParamDto,Integer couponType, String trackingNo) {
+        return null;
+    }
+
     /**
      * 获取商品详细信息
      *

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/impl/ShoppingCartBaseServiceImpl.java

@@ -216,6 +216,19 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
         }
     }
 
+
+    @Override
+    public BaseResponse clearMCCafeCouponByType(CartParamDto cartParamDto,Integer couponType,String trackingNo) {
+        try {
+            cartParamDto.setCouponType(couponType);
+            redisTemplate.delete(this.getShoppingCartCouponCodeKey(cartParamDto));
+            return new BaseResponse(VersionUtils.VER_1, CartResponseConstant.SUCCESS.getCode(), CartResponseConstant.SUCCESS.getMessage());
+        } catch (Exception e) {
+            ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "clearMoneyCoupon", cartParamDto, e, Level.ERROR);
+            return null;
+        }
+    }
+
     /**
      * 修正购物车中的spu和sku商品信息
      *

shopping-cart-application-service/pom.xml

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

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

@@ -735,6 +735,10 @@ public class ShoppingCartMCoffeeServiceImpl {
                 setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
                 return ResponseUtil.success(shoppingCartGoodsResponseVo);
             }else {
+                //清除当前用户的代金券缓存，防止切换门店券数据带到不适用门店
+                com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = assortmentSdkService.getCartParamDto(partnerId, fromStoreId, userId);
+                shoppingCartBaseService.clearMCCafeCouponByType(cartParamDto, SaveCouponType.COUPON.getCode(),LogThreadLocal.getTrackingNo());
+
                 // 新门店check购物车中所有商品
                 List<CartGoods> temList = new ArrayList<>();
                 for (CartGoods goods : cartGoodsList) {