Merge branch 'feature/20210203_P5V4购物车新增商品券门槛金额字段_yu.sun'

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

assortment-shoppingcart-sdk/pom.xml

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

assortment-shoppingcart-sdk/readme.md

@@ -12,3 +12,4 @@
 | 1.1.9.RELEASE| 清除代金券缓存| 缪晖 | 2020-12-17 |
 | 1.2.0.RELEASE| 清除代金券缓存| 李小二 | 2021-01-19 |
 | 1.2.1.RELEASE| 麦咖啡菜单购月享卡更新字段| 孙昱 | 2021-01-26 |
+| 1.2.3.RELEASE| 麦咖啡商品券门槛金额字段| 孙昱 | 2021-02-04 |
\ No newline at end of file

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

@@ -91,6 +91,10 @@ public class CartGoods {
      */
     private int isSunnyCoupon;
     /**
+     * 商品券门槛金额
+     */
+    private Long couponThresholdAmount;
+    /**
      * 月享卡信息
      */
     private MonthCardVo monthCardInfo;

shopping-cart-application-service/pom.xml

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

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

@@ -88,7 +88,10 @@ public class CartGoods {
      * 商品券名称
      */
     private String couponName;
-
+    /**
+     * 商品券门槛金额
+     */
+    private Long couponThresholdAmount;
     private String spuId;
     private String skuId;
     /**

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

@@ -433,6 +433,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, couponCode,
                 cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo,null);
+
         //把月卡放到最后
         if (CollectionUtils.isNotEmpty(cartGoodsList)) {
             int size = cartGoodsList.size();
@@ -1523,6 +1524,7 @@ public class ShoppingCartMCoffeeServiceImpl {
             cartGoods.setMonthCardInfo(addShoppingCartGoodsRequestVo.getMonthCardInfo());
         }
         cartGoods.setIsSunnyCoupon(addShoppingCartGoodsRequestVo.getIsSunnyCoupon());
+        cartGoods.setCouponThresholdAmount(addShoppingCartGoodsRequestVo.getCouponThresholdAmount());
         cartGoods.setGoodsType(goodsType);
         cartGoods.setExtra(addShoppingCartGoodsRequestVo.getExtra());
         cartGoods.setSpecialExtra(addShoppingCartGoodsRequestVo.getSpecialExtra());

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

@@ -119,6 +119,10 @@ public class MCoffeeAddGoodsRequestVo {
      * 券类型 0：商品券
      */
     private Integer couponType;
+    /**
+     * 商品券门槛金额
+     */
+    private Long couponThresholdAmount;
 
     /**
      * 是否是太阳蛋商品