Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

 Conflicts:
	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

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

@@ -25,6 +25,10 @@ public class RedisKeyConstant {
     /**
      * 用户购物车在redis的key前缀
      */
+    public final static String SAAS_SHOPPINGCART_COUPON_KEY_PREFIX_TYPE = "saas:user:info:cart:coupon:type:";
+    /**
+     * 用户购物车在redis的key前缀
+     */
     public final static String SAAS_USER_INFO_CART_CARTADDPRODUCT = "saas:user:info:cart:cartAddProduct:goods:";
     /**
      * 用户购物车总价在redis的key前缀

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

@@ -41,4 +41,9 @@ public class CartParamDto {
     private MealClearOperationEnum operationType;
 
     private Integer couponType;
+
+    /**
+     * 各类券信息
+     */
+    private List<CouponTypeVo> couponTypeList;
 }

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

+package com.freemud.sdk.api.assortment.shoppingcart.domain;
+
+import lombok.Data;
+
+@Data
+public class CouponTypeVo {
+    /**
+     * 券类型 1：买三赠一券
+     */
+    private Integer type;
+    /**
+     * 券code
+     */
+    private String code;
+}

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/enums/SaveCouponType.java

@@ -5,6 +5,8 @@ public enum SaveCouponType {
     COUPON(1, "代金券"),
     FREIGHT_COUPON(2, "运费券"),
     MON_COUPON(3, "随单购月卡"),
+    THREE_TO_ONE_COUPON(4, "买三赠一券"),
+    THREE_TO_ONE_ACTIVITY_CODE(5, "买三赠一券虚拟活动号"),
     ;
 
     private Integer code;

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

@@ -109,6 +109,26 @@ public interface ShoppingCartBaseService {
     BaseResponse clear(CartParamDto cartParamDto, String trackingNo);
 
     /**
+     *
+     * @param cartParamDto
+     * @param trackingNo
+     * @return
+     */
+    default BaseResponse<List<CouponTypeVo>> setTypeCartCouponCode(CartParamDto cartParamDto, String trackingNo) {
+        return null;
+    }
+
+    /**
+     *
+     * @param cartParamDto
+     * @param trackingNo
+     * @return
+     */
+    default BaseResponse<List<CouponTypeVo>> getTypeCartCouponCode(CartParamDto cartParamDto, String trackingNo) {
+        return null;
+    }
+
+    /**
      * 清除麦咖啡购物车商品行信息
      *
      * @param cartParamDto

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

@@ -3,41 +3,23 @@ package com.freemud.sdk.api.assortment.shoppingcart.service.impl;
 import ch.qos.logback.classic.Level;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.redis.RedisCache;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.freemud.application.sdk.api.couponcenter.enums.CouponTypeEnum;
 import com.freemud.application.sdk.api.couponcenter.online.domain.*;
 import com.freemud.application.sdk.api.couponcenter.online.request.ActiveBatchQueryRequest;
-import com.freemud.application.sdk.api.couponcenter.online.request.CouponDetailRequest;
-import com.freemud.application.sdk.api.couponcenter.online.request.PartnerRequest;
-import com.freemud.application.sdk.api.couponcenter.online.response.CouponDetailResponse;
 import com.freemud.application.sdk.api.couponcenter.online.service.FMActiveSdkService;
 import com.freemud.application.sdk.api.couponcenter.online.service.OnlineCouponSdkService;
 import com.freemud.application.sdk.api.log.ErrorLog;
-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.domain.ProductInfosDTO;
-import com.freemud.application.sdk.api.productcenter.request.menu.GetMenuCategoryByIdsRequest;
-import com.freemud.application.sdk.api.productcenter.request.product.GetProductRequest;
-import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCategoryByIdsResponse;
-import com.freemud.application.sdk.api.productcenter.response.menu.GetMenuCategoryInfoResponse;
-import com.freemud.application.sdk.api.productcenter.response.product.GetProductInfosResponse;
 import com.freemud.application.sdk.api.productcenter.service.MenuService;
 import com.freemud.application.sdk.api.productcenter.service.ProductService;
 import com.freemud.sdk.api.assortment.shoppingcart.adapter.ShoppingCartAdapter;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.*;
 import com.freemud.sdk.api.assortment.shoppingcart.domain.*;
 import com.freemud.sdk.api.assortment.shoppingcart.enums.SaveCouponType;
-import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
-import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.util.CartResponseUtil;
-import com.freemud.sdk.api.assortment.shoppingcart.util.DateTimeUtils;
 import com.freemud.sdk.api.assortment.shoppingcart.util.PropertyConvertUtil;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.BoundHashOperations;
@@ -45,7 +27,6 @@ import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -154,6 +135,34 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
     }
 
     @Override
+    public BaseResponse<List<CouponTypeVo>> setTypeCartCouponCode(CartParamDto cartParamDto, String trackingNo) {
+        try {
+            String redisKey = getShoppingCartTypeCouponCodeKey(cartParamDto);
+            redisTemplate.delete(redisKey);
+            BoundValueOperations<String, List<CouponTypeVo>> operations = redisTemplate.boundValueOps(redisKey);
+
+            operations.set(cartParamDto.getCouponTypeList());
+            return CartResponseUtil.success();
+        } catch (Exception e) {
+            ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "setTypeCartCouponCode", cartParamDto, e, Level.ERROR);
+            return null;
+        }
+    }
+
+    @Override
+    public BaseResponse<List<CouponTypeVo>> getTypeCartCouponCode(CartParamDto cartParamDto, String trackingNo) {
+        try {
+            String redisKey = getShoppingCartTypeCouponCodeKey(cartParamDto);
+            BoundValueOperations<String, List<CouponTypeVo>> operations = redisTemplate.boundValueOps(redisKey);
+            List<CouponTypeVo> couponTypeVos = operations.get();
+            return CartResponseUtil.success(couponTypeVos);
+        } catch (Exception e) {
+            ErrorLog.printErrorLog("assortment-shoppingcart-sdk", trackingNo, e.getMessage(), "getTypeCartCouponCode", cartParamDto, e, Level.ERROR);
+            return null;
+        }
+    }
+
+    @Override
     public BaseResponse<CartGoods> getCartGoods(CartParamDto cartParamDto, String trackingNo) {
         try {
             String redisKey = getShoppingCartGoodsKey(cartParamDto);
@@ -341,6 +350,10 @@ public class ShoppingCartBaseServiceImpl implements ShoppingCartBaseService {
         return RedisKeyConstant.SAAS_SHOPPINGCART_COUPON_KEY_PREFIX + cartParamDto.getPartnerId() + "_" + cartParamDto.getStoreId() + "_" + cartParamDto.getUserId() + "_" + cartParamDto.getCouponType();
     }
 
+    private String getShoppingCartTypeCouponCodeKey(CartParamDto cartParamDto) {
+        return RedisKeyConstant.SAAS_SHOPPINGCART_COUPON_KEY_PREFIX_TYPE + cartParamDto.getPartnerId() + "_" + cartParamDto.getStoreId() + "_" + cartParamDto.getUserId();
+    }
+
     /**
      * 获取记录购物车价格的key
      *

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

@@ -83,6 +83,10 @@ public class ActivityCalculationDiscountRequestDto {
          * 活动号
          */
         private String activityCode;
+        /**
+         * 买卡活动Id
+         */
+        private String payCardActivityId;
     }
 
     @Data

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

@@ -169,13 +169,22 @@ public class ActivityCalculationDiscountResponseDto {
              */
             private String tenderId;
             /**
-             *  1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
+             *  1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券 7买三赠一券
              */
             private Integer extendType;
 
             private SendPointDto sendPointVo;
 
             private Date endTime;
+
+            /**
+             * 买卡现价
+             */
+            private Integer cardAmount;
+            /**
+             * 买卡原价
+             */
+            private Integer cardOriginalPrice;
         }
 
         @Data

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

@@ -23,7 +23,7 @@ public class ActivityDiscountsDto {
     private Integer activityType;
     private String tenderId;
     /**
-     * 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券
+     * 1-运费券 2-运费月卡券 3-月卡券 4-万能券 5-啡常月享卡 6-通用券 7-买三赠一券
      */
     private Integer extendType;
 

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

@@ -133,6 +133,11 @@ public class ShoppingCartGoodsDto {
     private SendPoint sendPoint;
 
 
+    /**
+     * 麦咖啡-买三赠一券价格
+     */
+    private Long buyThreeGiveOneCouponFee;
+
     @Data
     public static class CartGoodsDetailDto {
         /**

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CouponTypeVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+@Data
+public class CouponTypeVo {
+    /**
+     * 券类型 1：买三赠一券
+     */
+    private Integer type;
+    /**
+     * 券code
+     */
+    private String code;
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -141,4 +141,19 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
      */
     private Long payCardFee;
 
+    /**
+     * 各类券信息
+     */
+    private List<CouponTypeVo> couponTypeList;
+
+    /**
+     * 麦咖啡-买三赠一券活动号
+     */
+    private String buyThreeGiveOneActivityCode;
+
+    /**
+     * 麦咖啡-买三赠一券默认券号
+     */
+    private String buyThreeGiveOneCouponCode;
+
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -87,6 +87,31 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private String menuType ;
 
+    /**
+     * 随单购是否购买月享卡
+     * 1:不购买，2：月卡续费，3：新购月卡
+     */
+    private String buyMonthlyCard;
+    /**
+     * 月享卡卡号
+     */
+    private String monthlyCardCode;
+
+    /**
+     * 各类券信息
+     */
+    private List<CouponTypeVo> couponTypeList;
+
+    /**
+     * 麦咖啡-买三赠一券活动号
+     */
+    private String buyThreeGiveOneActivityCode;
+
+    /**
+     * 麦咖啡-买三赠一券默认券号
+     */
+    private String buyThreeGiveOneCouponCode;
+
     @Data
     public final static class SendGoods {
         /**

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/UpdateShoppingCartGoodsQtyRequestVo.java

@@ -37,6 +37,11 @@ public class UpdateShoppingCartGoodsQtyRequestVo extends BaseRequestVo {
     @NotNull(message = "qty不能为空")
     private Integer qty;
 
+    /**
+     * 更新前商品数量
+     */
+    private Integer oldQty;
+
     private String version;
     /**
      * 购物车版本号（围餐）

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

@@ -32,6 +32,7 @@ public enum ActivityTypeEnum {
     TYPE_3(3, "代金券"),
     TYPE_31(31, "折扣券"),
     TYPE_32(32, "商品券"),
+    TYPE_35(35, "买三赠一券"),
     TYPE_5(5, "整单满金额折"),
     TYPE_51(51, "每满金额折"),
     TYPE_52(52, "阶梯满金额折"),

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

@@ -3,11 +3,10 @@ package cn.freemud.service.impl;
 import ch.qos.logback.classic.Level;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.CartGoods;
+import cn.freemud.entities.vo.CouponTypeVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsBaseResponseVo;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
-import cn.freemud.utils.LogUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
@@ -20,10 +19,8 @@ import com.freemud.sdk.api.assortment.shoppingcart.request.GetProductInfoRequest
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
-import javax.naming.Name;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -149,6 +146,25 @@ public class AssortmentSdkService {
     }
 
     /**
+     * 获取用户选择的优惠券列表
+     *
+     * @param partnerId
+     * @param storeId
+     * @param useId
+     * @param shoppingCartService
+     * @return
+     */
+    public List<CouponTypeVo> getTypeCartCouponCode(String partnerId, String storeId, String useId, ShoppingCartBaseService shoppingCartService) {
+        com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = getCartParamDto(partnerId, storeId, useId);
+        BaseResponse<List<com.freemud.sdk.api.assortment.shoppingcart.domain.CouponTypeVo>> baseResponse = shoppingCartService.getTypeCartCouponCode(cartParamDto, LogThreadLocal.getTrackingNo());
+        if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {
+            return null;
+        }
+
+        return  JSONArray.parseArray(JSONObject.toJSONString(baseResponse.getResult()), CouponTypeVo.class);
+    }
+
+    /**
      * 调用聚合sdk设置缓存中购物车信息
      *
      * @param partnerId
@@ -190,6 +206,21 @@ public class AssortmentSdkService {
     }
 
     /**
+     * 保存用户选择的优惠券列表
+     * @param partnerId
+     * @param storeId
+     * @param useId
+     * @param couponTypeList
+     * @param shoppingCartService
+     * @return
+     */
+    public void setTypeCartCouponCode(String partnerId, String storeId, String useId, List<CouponTypeVo> couponTypeList , ShoppingCartBaseService shoppingCartService) {
+        com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = getCartParamDto(partnerId, storeId, useId);
+        cartParamDto.setCouponTypeList(JSONArray.parseArray(JSONObject.toJSONString(couponTypeList), com.freemud.sdk.api.assortment.shoppingcart.domain.CouponTypeVo.class));
+        shoppingCartService.setTypeCartCouponCode(cartParamDto, LogThreadLocal.getTrackingNo());
+    }
+
+    /**
      * 调用SDK校验购物车
      *
      * @param oldAllCartGoodsList

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

@@ -91,7 +91,7 @@ public class CalculationServiceImpl {
                                                                                                             boolean isMember, String menuType, String receiveId,String couponCode,
                                                                                                             List<CartGoods> cartGoodsList, List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons,
                                                                                                             List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList, ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo,
-                                                                                                            Long payCardFee) {
+                                                                                                            Long payCardFee, List<String> eliminateGoodsList) {
 
         Long deliveryAmount = calculateDeliveryAmount(receiveId, partnerId, storeId, menuType);
 
@@ -107,13 +107,15 @@ public class CalculationServiceImpl {
 
         //优惠券
         CouponPromotionVO couponPromotionVO = couponDiscountCalculation.getCouponPromotionVO(partnerId, storeId, userId, couponCode, orderType);
-        couponDiscountCalculation.updateShoppingCartGoodsDiscount(couponPromotionVO,calculationDiscount,cartGoodsList, shoppingCartGoodsResponseVo);
+        couponDiscountCalculation.updateShoppingCartGoodsDiscount(couponPromotionVO,calculationDiscount,cartGoodsList, shoppingCartGoodsResponseVo,eliminateGoodsList);
 
         //套餐
         setMealCalculation.updateShoppingCartGoodsDiscount(calculationDiscount,cartGoodsList,shoppingCartGoodsResponseVo);
 
         //加料
         materialCalculation.updateShoppingCartGoodsApportion(calculationDiscount,cartGoodsList);
+        //买三赠一券
+        couponDiscountCalculation.updateBuyThreeToOneShoppingCartGoodsDiscount(calculationDiscount, cartGoodsList, shoppingCartGoodsResponseVo);
         return calculationDiscount;
     }
 
@@ -166,7 +168,8 @@ public class CalculationServiceImpl {
     }
 
 
-    public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo){
+    public void updateShoppingCartGoodsApportion(ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo, ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult,
+                                                 ShoppingCartGoodsDto shoppingCartGoodsDto, CreateOrderVo.PremiumExchangeActivity premiumExchangeActivity, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo){
 
         List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtoList = CollectionUtils.isEmpty(shoppingCartGoodsDto.getProducts()) ? new ArrayList<>() : shoppingCartGoodsDto.getProducts();
         List<ShareDiscountActivityDto> shareDiscountActivityDtoList = CollectionUtils.isEmpty(shoppingCartGoodsDto.getShareDiscountActivityDtos()) ? new ArrayList<>() : shoppingCartGoodsDto.getShareDiscountActivityDtos();
@@ -178,7 +181,8 @@ public class CalculationServiceImpl {
         shoppingCartGoodsDto.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount());
         //随单购 月卡价格
         shoppingCartGoodsDto.setPayCardFee(shoppingCartGoodsResponseVo.getPayCardFee());
-
+        long buyThreeGiveOneCouponFee = calculationDiscountResult.getDiscounts().stream().filter(t -> t.getExtendType() == 7).mapToLong(apportionGoods -> apportionGoods.getCardAmount()).sum();
+        shoppingCartGoodsDto.setBuyThreeGiveOneCouponFee(buyThreeGiveOneCouponFee);
         shoppingCartGoodsDto.setDeliveryAmount(shoppingCartGoodsResponseVo.getDeliveryAmount());
         shoppingCartGoodsDto.setDiscountDeliveryAmount(shoppingCartGoodsResponseVo.getDiscountDeliveryAmount());
         shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());

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

@@ -133,4 +133,13 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private String groupName;
 
+    /**
+     * 买三赠一券code
+     */
+    private String buyThreeGiveOneCouponCode;
+    /**
+     * 买三赠一券活动号
+     */
+    private String buyThreeGiveOneActivityCode;
+
 }