Merge branch 'feature/20210111_P5V2菜单购买月享卡_yu.sun'

# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	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>1.2.0.RELEASE</version>
+    <version>2.0.20-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-shoppingcart-sdk/readme.md

@@ -10,4 +10,5 @@
 | 1.1.7.RELEASE| 标识套餐类型| 孙昱 | 2020-12-01 |
 | 1.1.8.RELEASE| 拼单| 缪晖 | 2020-12-10 |
 | 1.1.9.RELEASE| 清除代金券缓存| 缪晖 | 2020-12-17 |
-| 1.2.0.RELEASE| 清除代金券缓存| 李小二 | 2021-01-19 |
\ No newline at end of file
+| 1.2.0.RELEASE| 清除代金券缓存| 李小二 | 2021-01-19 |
+| 2.0.20-SNAPSHOT| 更新cartGoods字段 | 孙昱 | 2021-01-15 |

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

@@ -79,6 +79,18 @@ public class CartGoods {
      */
     private String couponCode;
     /**
+     * 是否是月享卡商品
+     */
+    private int isMonthCard;
+    /**
+     * 是否为种子券商品 1:是；0:否
+     */
+    private int isSeedCouponGoods;
+    /**
+     * 月享卡信息
+     */
+    private MonthCardVo monthCardInfo;
+    /**
      * 商品券名称
      */
     private String couponName;
@@ -253,6 +265,23 @@ public class CartGoods {
     }
 
     @Data
+    @NoArgsConstructor
+    public class MonthCardVo {
+        /**
+         * 卡号
+         */
+        private String cardNo;
+        /**
+         * 券号
+         */
+        private String cardCode;
+        /**
+         * 月享卡类型：1.月享卡(单商品购买)；2.月享卡(多商品购买)；3.普通月卡
+         */
+        private Integer type;
+    }
+
+    @Data
     public final static class ComboxGoods{
         /**
          * 单规格spuId,多规格skuId

shopping-cart-application-service/pom.xml

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

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java

@@ -169,9 +169,14 @@ public class ShoppingCartMccafeAdapter {
         cartGoodsDetailDto.setSpecialExtra(cartGoods.getSpecialExtra());
         cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
         cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
+        //菜单购月享卡信息
+        cartGoodsDetailDto.setIsMonthCard(cartGoods.getIsMonthCard());
+        cartGoodsDetailDto.setMonthCardInfo(cartGoods.getMonthCardInfo());
         if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
-        } else if (cartGoods.isWeightType()) {
+        } else if(GoodsTypeEnum.VIRTUAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())){
+            cartGoodsDetailDto.setProductType(ProductType.VIRTUAL_PRODUCT.getCode());
+        }else if (cartGoods.isWeightType()) {
             cartGoodsDetailDto.setProductType(ProductType.WEIGHT_PRODUCT.getCode());
         }
 

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

@@ -4,6 +4,7 @@ import cn.freemud.entities.dto.OrderProductAddInfo;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
 import cn.freemud.entities.vo.CartGoods;
+import cn.freemud.entities.vo.MonthCardVo;
 import cn.freemud.entities.vo.SubtractStockVO;
 import com.alibaba.fastjson.JSON;
 import lombok.Builder;
@@ -254,6 +255,18 @@ public class ShoppingCartGoodsDto {
          */
         private Integer isTableware = 0;
         /**
+         * 是否是月享卡商品
+         */
+        private int isMonthCard;
+        /**
+         * 是否为种子券商品 1:是；0:否
+         */
+        private int isSeedCouponGoods;
+        /**
+         * 月享卡信息
+         */
+        private MonthCardVo monthCardInfo;
+        /**
          * 商品货号
          */
         private String productCode;

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

@@ -200,6 +200,18 @@ public class CartGoods {
      */
     private Boolean isTableware = false;
     /**
+     * 是否是月享卡商品
+     */
+    private int isMonthCard;
+    /**
+     * 是否为种子券商品 1:是；0:否
+     */
+    private int isSeedCouponGoods;
+    /**
+     * 月享卡信息
+     */
+    private MonthCardVo monthCardInfo;
+    /**
      * 第三方商品编码
      */
     private String customerCode;

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

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * All rights Reserved, Designed By sunary.site
+ *
+ * @version v1.0
+ * @Title: IntelliJ IDEA
+ * @Package cn.freemud.entities.vo
+ * @Description: 请简单描述下这个类是做什么用的
+ * @author: yu.sun
+ * @date: 2021-01-11 15:18:36
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ */
+@Data
+@NoArgsConstructor
+public class MonthCardVo {
+    /**
+     * 卡号
+     */
+    private String cardNo;
+    /**
+     * 券号
+     */
+    private String cardCode;
+    /**
+     * 月享卡类型：1.月享卡(单商品购买)；2.月享卡(多商品购买)；3.普通月卡
+     */
+    private Integer type;
+}

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

@@ -23,6 +23,7 @@ public enum GoodsTypeEnum {
     SPU_GOODS(5, "spu商品"),
     REDUCE_PRICE_GOODS(6,"超值加购商品"),
     ALL_COUPON_GOODS(8, "万能券商品"),
+    VIRTUAL_GOODS(9,"虚拟商品"),
     MATERIAL(88, "有加料的商品"),
     EXCEPTION_GOODS(99, "异常商品:商品菜单变化导致和购物车不商品匹配");
     private Integer goodsType;

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

@@ -101,6 +101,7 @@ public enum ResponseResult {
     SHOPPING_CART_BUY_ONE_SEND_GOODS_NOT_EMPTY("44032", "未查询到寄件活动商品"),
     SHOPPING_CART_BUY_ONE_SEND_GOODS_ERR("44033", "寄件活动商品错误"),
     SHOPPING_CART_COUPON_MIX_NOT_EXIST("44034", "券商品不存在"),
+    SHOPPING_CART_QTY_LIMIT_ERR("44035", "该商品单次购买数量限制为10，请知晓"),
 
     /**
      * 订单状态码
@@ -178,7 +179,8 @@ public enum ResponseResult {
     /**
      * coco验证券错误
      */
-    COCO_COUPON_VALIDATOR_FAIL("49000", "优惠券验证错误")
+    COCO_COUPON_VALIDATOR_FAIL("49000", "优惠券验证错误"),
+    NEW_PURCHASE("49001", "超过限购数量了")
     ;
 
 

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

@@ -128,6 +128,10 @@ public class CouponDiscountCalculation {
                 if (CollectionUtils.isNotEmpty(discountsNew)) {
                     ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discountsNew.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
                     cartGoods.setCouponName(goodsDiscount.getActivityName());
+                }else{
+                    //若没有商品优惠，清空当前商品的券缓存信息
+                    cartGoods.setCouponCode("");
+                    cartGoods.setCouponName("");
                 }
             }
         }

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

 package cn.freemud.service.impl.mcoffee.entity;
 
-import cn.freemud.entities.vo.CartGoods;
-import cn.freemud.entities.vo.ComboxGoodsRequestVo;
-import cn.freemud.entities.vo.MaterialRequestVo;
-import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
+import cn.freemud.entities.vo.*;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -133,4 +130,17 @@ public class MCoffeeAddGoodsRequestVo {
      */
     private String groupName;
 
+    /**
+     * 当前商品是否为月享卡，0:否，1:是
+     */
+    private int isMonthCard;
+    /**
+     * 是否为种子券商品 1:是；0:否
+     */
+    private int isSeedCouponGoods;
+    /**
+     * 月享卡加购信息
+     */
+    private MonthCardVo monthCardInfo;
+
 }