sunyu::update::fix conflicts

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.2.20-SNAPSHOT</version>
+    <version>2.2.21-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -66,6 +66,7 @@
 | 1.8.10-SNAPSHOT | 集点为0时不调用会员接口 | 梁崇福 | 2020-06-01 |
 | 1.9.1-SNAPSHOT | 修改客如云接口名 | 海波 | 2020-06-05 |
 | 1.9.2-SNAPSHOT| 预约单任务删除  | wuping | 2020-06-05 |
+<<<<<<< HEAD
 | 1.9.3-SNAPSHOT| 围餐  | dingkai | 2020-06-08 |
 | 1.9.4-SNAPSHOT| 券码接口修改为channel_code  | 梁崇福 | 2020-06-08 |
 | 1.9.5-SNAPSHOT| 商品统计分类编号保存 | wuping | 2020-06-09 |
@@ -109,3 +110,31 @@
 | 2.2.18-SNAPSHOT|  抖音支付新增抖音单号和openId   | 张志恒 | 2020-12-4 |
 | 2.2.19-SNAPSHOT|  买一赠一寄件   | 刘鹏飞 | 2020-12-11 |
 | 2.2.20-SNAPSHOT|  抖音支付   | 张志恒 | 2020-12-11 |
+=======
+| 1.5.11.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
+| 1.5.12.RELEASE | 围餐 | dingkai | 2020-06-16 |
+| 1.5.13.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
+| 1.5.14.RELEASE | 停车费sdk | dingkai | 2020-06-22 |
+| 1.5.16.RELEASE | 增加支付渠道编号 | 李小二 | 2020-07-08 |
+| 1.5.17.RELEASE | 停车场订单修改 | 伍平 | 2020-07-13 |
+| 2.0.5-RELEASE | 围餐修改 | 谌会阳 | 2020-07-27 |
+| 2.0.6-RELEASE | ordercenter新增常量 | 张志恒 | 2020-08-04 |
+| 2.0.7-RELEASE | 加料商品开发 | 梁崇福 | 2020-08-24 |
+| 2.0.8-RELEASE | 订单渠道映射调整 | 李小二 | 2020-08-24 |
+| 2.0.9-RELEASE | 麦咖啡 | 徐康 | 2020-09-07 |
+| 2.10.0-RELEASE | 停车场订单 | 张志恒 | 2020-09-28 |
+| 2.0.11-RELEASE | 麦咖啡多规格 | 徐康 | 2020-10-09 |
+| 2.0.12-RELEASE | 停车场订单 | 张志恒 | 2020-10-14 |
+| 2.0.13-RELEASE | 麦咖啡运费券 | 徐康 | 2020-10-20 |
+| 2.0.14-RELEASE | 集点推送改造 | 徐康 | 2020-10-28 |
+| 2.0.15.RELEASE | 麦咖啡加料 | 徐康 | 2020-10-30 |
+| 2.0.16.RELEASE | 麦咖啡问题修复 | 徐康 | 2020-11-09 |
+| 2.1.2.RELEASE | 活动扣减库存 | 缪晖 | 2020-11-11 |
+| 2.1.3-RELEASE | 退款增加自动退款配置的null判断 | 刘鹏飞 | 2020-11-12 |
+| 2.1.4-RELEASE | 退款增加自动退款配置的null判断 | 刘鹏飞 | 2020-11-12 |
+| 2.1.5-RELEASE | 麦咖啡权益卡金额入机 | 徐康 | 2020-11-23 |
+| 2.1.6-RELEASE | hun | 徐康 | 2020-11-23 |
+| 2.1.7-RELEASE | 农工商撤单 | 张志恒 | 2020-12-07 |
+| 2.1.8-RELEASE | 拼单 | 缪晖 | 2020-12-10 |
+| 2.1.9-RELEASE | 去掉0元核销优惠券 | 李小二 | 2020-12-14 |
+>>>>>>> feature/20201216_切换门店清除代金券缓存_yu.sun

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.15-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

assortment-shoppingcart-sdk/readme.md

@@ -19,3 +19,4 @@
 | 2.0.12-SNAPSHOT| 拼单  | 缪晖 | 2020-12-02  |
 | 2.0.13-SNAPSHOT| 拼单  | 缪晖 | 2020-12-02  |
 | 2.0.14-SNAPSHOT| 商品券添加校验  | 梁崇福 | 2020-12-15  |
+| 2.0.15-SNAPSHOT| 麦咖啡清除券缓存  | 孙昱 | 2020-12-16  |

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -560,18 +560,4 @@ public class ShoppingCartAdapter {
         return false;
     }
 
-    public void updateSpqStock(CartGoods cartGoods, List<ProductBeanDTO> productBeans) {
-        Optional<ProductBeanDTO> firstProduct = productBeans.stream().filter(p -> ObjectUtils.equals(p.getPid(), cartGoods.getSpuId())).findFirst();
-        if (!firstProduct.isPresent()) {
-            return;
-        }
-        ProductBeanDTO spuProduct = firstProduct.get();
-        //是否是sku商品
-        boolean isSkuProduct = ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
-        // 如果是套餐商品，更新套餐内固定商品&可选商品的详细信息
-        boolean isSetMealProduct = ObjectUtils.equals(ProductType.SetMeal.getCode(), spuProduct.getType()) || ObjectUtils.equals(ProductType.IncreasedPackage.getCode(), spuProduct.getType());
-        ProductBeanDTO.SkuProductBean skuProduct = isSkuProduct ? spuProduct.getSkuList().stream().filter(p -> ObjectUtils.equals(cartGoods.getSkuId(), p.getSkuId())).findFirst().get() : null;
-        cartGoods.setStockLimit(isSkuProduct ? ObjectUtils.equals(1, skuProduct.getStockLimit()) : ObjectUtils.equals(1, spuProduct.getStockLimit()));
-
-    }
 }

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

@@ -136,6 +136,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;
+    }
+
     /**
      * 获取商品详细信息
      *
@@ -202,10 +213,6 @@ public interface ShoppingCartBaseService {
             for (CartGoods cartGoods : checkCartRequest.getCartGoodsList()) {
                 // 当goodsId为空或商品是商品券时直接跳过
                 if (StringUtils.isEmpty(cartGoods.getGoodsId()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType())) {
-                    if (Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.COUPON_GOODS.getGoodsType()) || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.HG_COUPON_GOODS.getGoodsType())){
-                        //商品券和换购券修改库存校验
-                        shoppingCartAdapter.updateSpqStock(cartGoods, productList);
-                    }
                     continue;
                 }
                 shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);

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

@@ -225,6 +225,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商品信息
      *

order-application-service/pom.xml

@@ -87,8 +87,8 @@
         <!--  商户门店sdk  -->
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>3.3.5-SNAPSHOT</version>
             <artifactId>storecenter-sdk</artifactId>
+            <version>3.3.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/CheckSpqInfoResponseDto.java

@@ -23,6 +23,7 @@ public class CheckSpqInfoResponseDto {
      * 券名称
      */
     private String couponName;
+    private boolean stockLimit;
     /**
      * 商品券code
      */

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

@@ -42,10 +42,12 @@ import cn.freemud.service.thirdparty.*;
 import cn.freemud.utils.*;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.productcenter.constant.ResponseConstant;
+import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductRequest;
 import com.freemud.application.sdk.api.productcenter.request.product.valid.ValidateShopProductType;
 import com.freemud.application.sdk.api.productcenter.response.ProductResponseDTO;
 import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResponse;
+import com.freemud.application.sdk.api.productcenter.response.valid.ValiadShopProductResult;
 import com.freemud.card.sdk.comm.Finals;
 import com.freemud.card.sdk.comm.SignUtil;
 import com.freemud.card.sdk.service.CouponAvailableService;
@@ -82,6 +84,7 @@ public class CouponServiceImpl implements CouponService {
 
     private final Gson gson = new Gson();
     //@Autowired
+
     //private MemberProductClient memberProductClient;
     @Autowired
     private CustomerExtendClient customerExtendClient;
@@ -717,6 +720,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setPrice(productsVo.getFinalPrice());
         dto.setSpuId(productsVo.getSpuId());
         dto.setSpuName(productsVo.getSkuName());
+        dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setSkuId(productsVo.getSkuId());
         dto.setSkuName(StringUtils.isNotBlank(productsVo.getSkuName()) ? productsVo.getSkuName() : productsVo.getSpuName());
         dto.setPicture(productsVo.getSpuPicture());
@@ -809,7 +813,6 @@ public class CouponServiceImpl implements CouponService {
              return null;
         }
 
-
         //券返回的商品id
         List<String> skuIds = Lists.newArrayList();
         String skuId = goodsId;
@@ -840,6 +843,7 @@ public class CouponServiceImpl implements CouponService {
         dto.setPicture(productsVo.getSpuPicture());
         dto.setDefaultSpecName(productsVo.getDefaultSpecName());
         dto.setDefaultSpecId(productsVo.getDefaultSpecId());
+        dto.setStockLimit(ObjectUtils.equals(1, productsVo.getStockLimit()));
         dto.setExtras(productsVo.getExtra());
         dto.setCouponType(couponType);
         log.info("dto***" + dto);

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

@@ -776,6 +776,9 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         CheckCartRequest checkCartRequest = assortmentSdkService.checkShoppingCartSdk(cartGoodsList, partnerId, storeId, shoppingCartGoodsResponseVo,
                 shoppingCartInfoRequestVo.getOrderType(), tableNumber, shoppingCartInfoRequestVo.getMenuType() ,shoppingCartBaseService);
         com.freemud.sdk.api.assortment.shoppingcart.domain.ShoppingCartGoodsResponseVo cartGoodsResponseVo = checkCartRequest.getShoppingCartGoodsResponseVo();
+        // 校验商品券库存
+
+
         //商品不再售卖状态或价格变动，直接返回报错
         if (cartGoodsResponseVo != null) {
             if (cartGoodsResponseVo.getCartGoodsStates() != null && cartGoodsResponseVo.getCartGoodsStates().isHasInvalidGoods()) {
@@ -976,6 +979,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                     validCouponMap.put(spqId, checkSpqInfoResponseDto);
                     cartGoods.setName(checkSpqInfoResponseDto.getCouponName());
                     cartGoods.setSpuName(checkSpqInfoResponseDto.getCouponName());
+                    cartGoods.setStockLimit(checkSpqInfoResponseDto.isStockLimit());
                     // 添加请求的优惠券信息
                     ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
                     coupon.setCode(checkSpqInfoResponseDto.getCouponCode());

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

@@ -105,7 +105,7 @@ public class CalculationSharingDiscountService {
                     validCouponMap.put(spqId, checkSpqInfo);
                     cartGoods.setName(checkSpqInfo.getCouponName());
                     cartGoods.setSpuName(checkSpqInfo.getCouponName());
-
+                    cartGoods.setStockLimit(checkSpqInfo.isStockLimit());
                     CalculationSharingDiscountRequestDto.CalculationDiscountCoupon coupon = new CalculationSharingDiscountRequestDto.CalculationDiscountCoupon();
                     coupon.setCode(checkSpqInfo.getCouponCode());
                     coupon.setActivityCode(checkSpqInfo.getActiveCode());

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

@@ -840,6 +840,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.clearMCCafe(cartParamDto, LogThreadLocal.getTrackingNo());
+
                 // 新门店check购物车中所有商品
                 List<CartGoods> temList = new ArrayList<>();
                 for (CartGoods goods : cartGoodsList) {