Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa

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

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2119,15 +2119,16 @@ public class OrderAdapter {
                 discountTotalAmount = discountTotalAmount + productDiscount.getDiscountAmount()*productDiscount.getDiscountQty();
                 if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
-                    Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
-                    if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) {
-                        productVo.setCouponName(productDiscount.getDiscountDesc());
-                    } else {
-                        productVo.setName(productDiscount.getDiscountDesc());
-                        productVo.setSpuName(productDiscount.getDiscountDesc());
-                        productVo.setExtras("");
-                        productVo.setSpecification("");
-                    }
+                    productVo.setCouponName(productDiscount.getDiscountDesc());
+//                    Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
+//                    if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) {
+//                        productVo.setCouponName(productDiscount.getDiscountDesc());
+//                    } else {
+//                        productVo.setName(productDiscount.getDiscountDesc());
+//                        productVo.setSpuName(productDiscount.getDiscountDesc());
+//                        productVo.setExtras("");
+//                        productVo.setSpecification("");
+//                    }
                 }
                 if (OrderAccountType.BUYM_SENDN.getCode().equals(productDiscount.getDiscountType())) {
                     activityType = ActivityTypeEnum.TYPE_61.getCode();
@@ -2157,6 +2158,9 @@ public class OrderAdapter {
         //套餐
         productVo.setParentProductId(productBean.getParentProductId());
         productVo.setProductType(productBean.getProductType());
+        if(ProductTypeEnum.TABLEWARE_PRODUCT.getCode().equals(productBean.getProductType())) {
+            productVo.setIsTableware(true);
+        }
         productVo.setUnit(productBean.getUnit());
         productVo.setWeight(productBean.getWeight() != null ? productBean.getWeight().doubleValue() : 0);
         return productVo;
@@ -2489,7 +2493,11 @@ public class OrderAdapter {
         createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
         createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
         createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
-        createOrderProductDemoDto.setProductType(productType);
+        if(!cartGoodsDetailDto.getIsTableware()) {
+            createOrderProductDemoDto.setProductType(productType);
+        } else {
+            createOrderProductDemoDto.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode());
+        }
         createOrderProductDemoDto.setParentProductId(cartGoodsDetailDto.getParentProductId());
         createOrderProductDemoDto.setIsFixedProduct(cartGoodsDetailDto.getIsFixedProduct());
         createOrderProductDemoDto.setCustomerCode(cartGoodsDetailDto.getCustomerCode());

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

@@ -197,6 +197,10 @@ public class ShoppingCartGoodsDto {
          */
         private boolean isStockLimit;
         /**
+         * 是否餐具商品
+         */
+        private Boolean isTableware = false;
+        /**
          * 商品重量
          */
         private Double weight;

order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java

@@ -154,6 +154,11 @@ public class ProductVo {
     private Integer productType;
 
     /**
+     * 是否餐具商品
+     */
+    private Boolean isTableware = false;
+
+    /**
      * 商品单位
      */
     private String unit;

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

@@ -30,6 +30,7 @@ import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.*;
@@ -42,6 +43,9 @@ public class ShoppingCartConvertAdapter {
     private static final String ATTRIBUTEID = "attributeId";
     private static final String ATTRIBUTENAME = "attributeName";
 
+    @Value("${mccafe.tableware.skuId}")
+    private String mcCafeTablewareSkuId;
+
     public ShoppingCartGoodsDto.CartGoodsDetailDto getCartGoodsDetailDto(CreateOrderVo.PremiumExchangeActivity.Product product, GetProductsVo getProductsVo, String goodsId, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods) {
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
         cartGoodsDetailDto.setOriginalPrice(getProductsVo.getFinalPrice());
@@ -121,6 +125,9 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setSpecialExtra(cartGoods.getSpecialExtra());
         cartGoodsDetailDto.setClassificationId(cartGoods.getClassificationId());
         cartGoodsDetailDto.setClassificationName(cartGoods.getClassificationName());
+        if(mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
+            cartGoodsDetailDto.setIsTableWare(true);
+        }
         if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());
         } else if (cartGoods.isWeightType()) {

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

@@ -255,6 +255,10 @@ public class ShoppingCartGoodsDto {
          */
         private boolean isStockLimit;
         /**
+         * 是否餐具商品
+         */
+        private Boolean isTableWare = false;
+        /**
          * 商品货号
          */
         private String productCode;

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

@@ -196,6 +196,10 @@ public class CartGoods {
      */
     private boolean isStockLimit;
     /**
+     * 是否餐具商品
+     */
+    private Boolean isTableWare = false;
+    /**
      * 第三方商品编码
      */
     private String customerCode;

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

@@ -123,6 +123,8 @@ public class ShoppingCartMCoffeeServiceImpl {
     private String mcCafeUniversalCouponCode;
     @Value("${mccafe.pay.card.fee}")
     private String payCardFee;
+    @Value("${mccafe.tableware.skuId}")
+    private String mcCafeTablewareSkuId;
 
     /**
      * 添加商品、超值加购、商品券
@@ -174,6 +176,14 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isEmpty(oldCartGoodsList)) {
             oldCartGoodsList = new ArrayList<>();
         }
+        if(mcCafeTablewareSkuId.equals(skuId)) {
+            for(CartGoods cartGoods : oldCartGoodsList) {
+                if(mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
+                    return ResponseUtil.error(ResponseResult.SHOPPING_CART_ADD_ERROR.getCode(), "不能重复添加餐具商品");
+                }
+            }
+        }
+
         //商品券已添加情况校验
         List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = checkGoodsCoupon(oldCartGoodsList, operationType, couponCode,goodsId,addShoppingCartGoodsRequestVo);
         CartGoods addCartGoods = convent2CartGoods(addShoppingCartGoodsRequestVo, goodsId ,vo);
@@ -1589,6 +1599,21 @@ public class ShoppingCartMCoffeeServiceImpl {
         if (CollectionUtils.isNotEmpty(reduceGoods)) {
             allCartGoodsList.addAll(reduceGoods);
         }
+
+        //如果是餐具商品，则放到最后
+        if (CollectionUtils.isNotEmpty(allCartGoodsList)) {
+            int size = allCartGoodsList.size();
+            for(int i=0;i<size;i++) {
+                if(allCartGoodsList.get(i).getSkuId().equals(mcCafeTablewareSkuId) && i != size-1) {
+                    CartGoods cartGoods = allCartGoodsList.get(i);
+                    cartGoods.setIsTableWare(true);
+                    allCartGoodsList.remove(i);
+                    allCartGoodsList.add(cartGoods);
+                    i--;
+                }
+            }
+        }
+
         return allCartGoodsList;
     }
 

shopping-cart-application-service/src/main/resources/application.properties

@@ -24,3 +24,4 @@ management.security.enabled=false
 management.health.rabbit.enabled=false
 
 
+mccafe.tableware.skuId=12345
\ No newline at end of file