Merge branch 'feature/xukang_20210407_麦咖啡p6v3'

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	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-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java

@@ -23,6 +23,7 @@ public enum OldOrderAccountType {
     COUPON(5, "代金券", "COUPON"),
     PRODUCT_COUPON(6, "商品券", "PRODUCT_COUPON"),
     SEED_PRODUCT_COUPON(37, "种子券", "SEED_PRODUCT_COUPON"),
+    EVM_PRODUCT_COUPON(39, "EVM券", "EVM_PRODUCT_COUPON"),
     DISCOUNT_COUPON(7, "折扣券", "DISCOUNT_COUPON"),
     DRIVER_FEE(7, "骑手小费", "DRIVER_FEE"),
     WITH_ORDER_BUY_COUPON_FEE(10, "随单买月卡", "WITH_ORDER_BUY_COUPON_FEE"),

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java

@@ -25,6 +25,7 @@ public enum QueryOrderAccountType {
     FREIGHT_COUPON("FREIGHT_COUPON", "运费券"),
     PRODUCT_COUPON("PRODUCT_COUPON", "商品券"),
     SEED_PRODUCT_COUPON("SEED_PRODUCT_COUPON", "种子券"),
+    EVM_PRODUCT_COUPON("EVM_PRODUCT_COUPON", "种子券"),
     DISCOUNT_COUPON("DISCOUNT_COUPON", "折扣券"),
     DISCOUNT_AMOUNT("DISCOUNT_AMOUNT", "限时折扣金额"),
     PREMIUM_EXCHANGE("PREMIUM_EXCHANGE", "加价购"),

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/request/CheckCartRequest.java

@@ -27,5 +27,6 @@ public class CheckCartRequest {
     private Integer orderWay;
     private String trackingNo;
     private String tableNumber;
+    private String sessionId;
     private String menuType;
 }

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

@@ -660,7 +660,7 @@ public class CouponAdapter {
     public MCCafeCouponRequest convert2MCCafeCouponRequest(QueryOrdersResponseDto.DataBean.OrderBean orderBean, QueryOrdersResponseDto.DataBean.OrderBean.AccountBean accountBean, McdNetBatchQueryResponse.Coupon coupon) {
         List<MCCafeProductRedeemVo> products = new ArrayList<>();
         //商品券核销核销参数
-        if (QueryOrderAccountType.PRODUCT_COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
+        if (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType()) || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())) {
             for (int i = 0; i < orderBean.getProductList().size(); i++) {
                 QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
                 String pid = org.apache.commons.lang3.StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
@@ -691,7 +691,7 @@ public class CouponAdapter {
                     }
                 }
             }
-        } else if (QueryOrderAccountType.COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
+        } else if (OldOrderAccountType.COUPON.getCode().equals(accountBean.getType())) {
             for (int i = 0; i < orderBean.getProductList().size(); i++) {
                 QueryOrdersResponseDto.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
                 String pid = org.apache.commons.lang3.StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
@@ -703,7 +703,7 @@ public class CouponAdapter {
                 mcCafeProductRedeemVo.setSeq(i + 1);
                 products.add(mcCafeProductRedeemVo);
             }
-        } else if (QueryOrderAccountType.FREIGHT_COUPON.equals(orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
+        } else if (OldOrderAccountType.FREIGHT_COUPON.getCode().equals(accountBean.getType())) {
             if(null != coupon) {
                 McdNetCouponProductRespDto mcdNetCouponProductRespDto = coupon.getCodeInfo().getProducts().get(0);
                 MCCafeProductRedeemVo mcCafeProductRedeemVo = new MCCafeProductRedeemVo();

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

@@ -2620,9 +2620,9 @@ public class OrderAdapter {
                 List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
                 cartGoodsDetailDto.getComboProducts().forEach(product -> {
                     CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getProductType());
-                    if(!product.getIsFixedProduct()) {
-                        createOrderProductDemoDto.setPrice(createOrderProductDemoDto.getPrice()+product.getOriginalPrice());
-                    }
+//                    if(!product.getIsFixedProduct()) {
+//                        createOrderProductDemoDto.setPrice(createOrderProductDemoDto.getPrice()+product.getOriginalPrice());
+//                    }
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品
@@ -2820,6 +2820,9 @@ public class OrderAdapter {
         if (ActivityTypeEnum.TYPE_31.getCode().equals(activityType)) {
             return OldOrderAccountType.DISCOUNT_COUPON;
         }
+        if (ActivityTypeEnum.TYPE_39.getCode().equals(activityType)) {
+            return OldOrderAccountType.EVM_PRODUCT_COUPON;
+        }
         if (ActivityTypeEnum.TYPE_PACKAGE.getCode().equals(activityType)) {
             return OldOrderAccountType.PACK_AMOUNT;
         }

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

@@ -35,6 +35,7 @@ public enum ActivityTypeEnum {
     TYPE_35(35, "买1赠3券"),
     TYPE_37(37, "种子券"),
     TYPE_38(38, "月享卡2.0"),
+    TYPE_39(39, "EVM券"),
     TYPE_5(5, "整单满金额折"),
     TYPE_51(51, "每满金额折"),
     TYPE_52(52, "阶梯满金额折"),

order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java

@@ -71,10 +71,11 @@ public class CouponClientServiceImpl implements CouponClientService {
             return null;
         }
         List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
-                account -> (orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON)
-                        ||  orderAdapter.getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.FREIGHT_COUPON))
+                account -> (OldOrderAccountType.COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.DISCOUNT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.FREIGHT_COUPON.getCode().equals(account.getType()))
         ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;
@@ -143,9 +144,10 @@ public class CouponClientServiceImpl implements CouponClientService {
             return null;
         }
         List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
-                account -> (OldOrderAccountType.PRODUCT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
-                        || OldOrderAccountType.COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
-                        || OldOrderAccountType.DISCOUNT_COUPON.equals(OldOrderAccountType.getByCode(account.getType()))
+                account -> (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.DISCOUNT_COUPON.getCode().equals(account.getType())
                         )).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList)) {
             return null;

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -43,9 +43,11 @@ public class McCafeCouponAdapter {
         }
 
         List<QueryOrdersResponse.DataBean.OrderBean.AccountBean> accountList = orderBean.getAccountList().stream().filter(
-                account -> (getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.PRODUCT_COUPON)
-                        ||  getQueryOrderAccountType(OldOrderAccountType.getByCode(account.getType())).equals(QueryOrderAccountType.DISCOUNT_COUPON))
+                account -> (OldOrderAccountType.COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.DISCOUNT_COUPON.getCode().equals(account.getType())
+                        || OldOrderAccountType.FREIGHT_COUPON.getCode().equals(account.getType()))
         ).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(accountList) ) {
             return null;
@@ -78,7 +80,7 @@ public class McCafeCouponAdapter {
     public MCCafeCouponRequest convert2MCCafeCouponRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, QueryOrdersResponse.DataBean.OrderBean.AccountBean accountBean, McdNetBatchQueryResponse.Coupon coupon) {
         List<MCCafeProductRedeemVo> products = new ArrayList<>();
         //商品券核销核销参数
-        if (QueryOrderAccountType.PRODUCT_COUPON.equals(getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
+        if (OldOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType()) || OldOrderAccountType.EVM_PRODUCT_COUPON.getCode().equals(accountBean.getType())) {
             for (int i = 0; i < orderBean.getProductList().size(); i++) {
                 QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
                 String pid = StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
@@ -109,7 +111,7 @@ public class McCafeCouponAdapter {
                     }
                 }
             }
-        }else if (QueryOrderAccountType.COUPON.equals(getQueryOrderAccountType(OldOrderAccountType.getByCode(accountBean.getType())))) {
+        }else if (OldOrderAccountType.COUPON.getCode().equals(accountBean.getType())) {
             for (int i = 0; i < orderBean.getProductList().size(); i++) {
                 QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
                 String pid = StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();

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

@@ -70,7 +70,7 @@ public class ShoppingCartMccafeAdapter {
             cartGoodsDetailDto.setSpuName(comboxGoods.getSpuName());
             cartGoodsDetailDto.setSkuId(comboxGoods.getGoodsId());
             cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(comboxGoods.getSkuName()) ? comboxGoods.getSpuName() : comboxGoods.getSkuName());
-            cartGoodsDetailDto.setOriginalPrice(comboxGoods.getOriginalPrice());
+            cartGoodsDetailDto.setOriginalPrice(comboxGoods.getFinalPrice());
             cartGoodsDetailDto.setPicture(comboxGoods.getPic());
             int qty = comboxGoods.getQty() * cartGoods.getQty();
             cartGoodsDetailDto.setQty(qty);
@@ -150,9 +150,9 @@ public class ShoppingCartMccafeAdapter {
         cartGoodsDetailDto.setSpuName(cartGoods.getSpuName());
         cartGoodsDetailDto.setSkuId(StringUtils.isEmpty(cartGoods.getSkuId()) ? cartGoods.getSpuId() : cartGoods.getSkuId());
         cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(cartGoods.getSkuName()) ? cartGoods.getSpuName() : cartGoods.getSkuName());
-        cartGoodsDetailDto.setOriginalPrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setOriginalPrice(cartGoods.getFinalPrice());
 //        cartGoodsDetailDto.setTotalDiscountAmount(0);
-        cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setSalePrice(cartGoods.getFinalPrice());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());
         cartGoodsDetailDto.setQty(cartGoods.getQty());
         cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());

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

@@ -20,4 +20,8 @@ public class ProductAttributeValueType {
     private String attributeId;
     private String attributeValue;
 
+    public String toString() {
+        return "attributeId:"+attributeId+" attributeValue:"+attributeValue;
+    }
+
 }

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

@@ -22,6 +22,7 @@ public class ValidateShopProductRequest {
     private String partnerId;
     private String storeId;
     private String channel;
+    private String sessionId;
     private List<ValidateShopProductType> productTypeList;
 
 }

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

@@ -29,4 +29,10 @@ public class ValidateSkuProductType {
 
     private ProductSpecAttrValueGroupType productSpecAttrValueGroupType;
 
+
+    public String toString() {
+        return "skuId:"+skuId+" productId:"+productId+" price:"+price+" markUpPrice:"+markUpPrice+" qty:"+qty+" productGroupId:"+productGroupId
+                +" attributeList:"+attributeList.toString();
+    }
+
 }

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

@@ -37,6 +37,7 @@ public enum ActivityTypeEnum {
     TYPE_33(33, "换购券"),
     TYPE_37(37, "月享卡种子券"),
     TYPE_38(38,"月享卡2.0"),
+    TYPE_39(39, "EVM券"),
     TYPE_5(5, "整单满金额折"),
     TYPE_51(51, "每满金额折"),
     TYPE_52(52, "阶梯满金额折"),

shopping-cart-application-service/src/main/java/cn/freemud/interceptor/ServiceException.java

@@ -23,6 +23,7 @@ public class ServiceException extends RuntimeException {
     public ServiceException(ResponseResult result, String message) {
         this.result = result;
         this.message = message;
+        this.result.setMessage(message);
     }
 
     public ResponseResult getResult() {

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

@@ -263,8 +263,7 @@ public class AssortmentSdkService {
         request.setStoreId(storeId);
         request.setTrackingNo(LogThreadLocal.getTrackingNo());
         request.setMenuType(BusinessTypeEnum.getByType(menuType).getCode());
-        BaseResponse<List<ProductBeanDTO>> baseResponse =
-                shoppingCartService.getProductsInfo(request);
+        BaseResponse<List<ProductBeanDTO>> baseResponse = shoppingCartService.getProductsInfo(request);
         if (baseResponse == null || !ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) || CollectionUtils.isEmpty(baseResponse.getResult())) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_PRODUCT_NOT_EXIST);
         }

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

@@ -203,7 +203,6 @@ public class CalculationServiceImpl {
         });
         for (int i = 0, len = cartGoodsList.size(); i < len; i++) {
             CartGoods cartGoods = cartGoodsList.get(i);
-//            List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartConvertAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
             List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartMccafeAdapter.convertCartGoods2DetailGoodsList(cartGoods, apportionGoodsList,duplicateGoodsMap);
             cartGoodsDetailDtoList.addAll(cartGoodsDetailDtos);
         }
@@ -498,7 +497,7 @@ public class CalculationServiceImpl {
         for (CartGoods cartGoods : cartGoodsList) {
             // 设置商品原价与商品现价的初始值
             long originalAmount = null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice()* cartGoods.getQty() : 0;
-            long amount =  null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice()* cartGoods.getQty() : 0;
+            long amount =  null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice()* cartGoods.getQty() : 0;
             long packAmount =  null != cartGoods.getPackPrice() ? cartGoods.getPackPrice()* cartGoods.getQty() : 0;
             totalOriginalAmount += originalAmount;
             totalAmount += amount;

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

@@ -195,10 +195,15 @@ public class CouponDiscountCalculation {
      */
     public void updateShoppingCartGoodsApportion(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto, ShoppingCartInfoRequestVo shoppingCartInfoRequestVo){
 
-        if (calculationDiscountResult == null || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
-                || !calculationDiscountResult.getDiscounts().stream().anyMatch(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
-                ||(ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType()))
-                ||(ActivityTypeEnum.TYPE_37.getCode().equals(discount.getType())) ||(ActivityTypeEnum.TYPE_38.getCode().equals(discount.getType()))))) {
+        if (calculationDiscountResult == null
+                || CollectionUtils.isEmpty(calculationDiscountResult.getDiscounts())
+                || !calculationDiscountResult.getDiscounts().stream().anyMatch(
+                        discount -> ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
+                                || ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())
+                                || ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())
+                                || ActivityTypeEnum.TYPE_37.getCode().equals(discount.getType())
+                                || ActivityTypeEnum.TYPE_38.getCode().equals(discount.getType())
+                                || ActivityTypeEnum.TYPE_39.getCode().equals(discount.getType()))) {
             return;
         }
         Map<String, Integer> extendTypeMap = calculationDiscountResult.getDiscounts().stream().filter(o -> o.getExtendType() != null)
@@ -209,9 +214,13 @@ public class CouponDiscountCalculation {
         if (CollectionUtils.isEmpty(couponDiscounts)) {
             return;
         }
-        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = couponDiscounts.stream().filter(discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
-                || (ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())
-                || (ActivityTypeEnum.TYPE_37.getCode().equals(discount.getType())) || (ActivityTypeEnum.TYPE_38.getCode().equals(discount.getType()))))).collect(Collectors.toList());
+        List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount> discounts = couponDiscounts.stream().filter(
+                discount -> (ActivityTypeEnum.TYPE_3.getCode().equals(discount.getType())
+                        || ActivityTypeEnum.TYPE_31.getCode().equals(discount.getType())
+                        || ActivityTypeEnum.TYPE_32.getCode().equals(discount.getType())
+                        || ActivityTypeEnum.TYPE_37.getCode().equals(discount.getType())
+                        || ActivityTypeEnum.TYPE_38.getCode().equals(discount.getType())
+                        || ActivityTypeEnum.TYPE_39.getCode().equals(discount.getType()))).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(discounts)) {
             return;
         }

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

@@ -48,8 +48,6 @@ public class SetMealCalculation {
         if (CollectionUtils.isEmpty(setMealProducts)) {
             return;
         }
-        //套餐可选商品现价
-        long productGroupTotalAmount = 0L;
         // 存储当前享受限时特价折扣的商品数量
         Map<String, Integer> numberMap = new HashMap<>();
         // 当前商品行现价
@@ -63,18 +61,6 @@ public class SetMealCalculation {
             }
 //            cartGoods.setOriginalAmount(cartGoods.getOriginalPrice() * cartGoods.getQty());
             cartGoods.setPackPrice(cartGoods.getPackPrice() * cartGoods.getQty());
-            // 可选商品现总价
-            productGroupTotalAmount = 0l;
-            long productGroupAmount =
-                    null == cartGoods.getProductGroupList() ? 0 :
-                            cartGoods.getProductGroupList().stream().mapToLong(t -> (null != t.getFinalPrice() ?
-                                    t.getFinalPrice():0) * (null != t.getQty() ? t.getQty():0)).sum();
-            productGroupTotalAmount += productGroupAmount * cartGoods.getQty();
-
-            // 固定商品现总价
-            long productComboAmount = cartGoods.getProductComboList().stream().mapToLong(t -> (null != t.getFinalPrice() ?
-                    t.getFinalPrice():0) * (null != t.getQty() ? t.getQty():0)).sum();
-            long productComboTotalAmount = productComboAmount * cartGoods.getQty();
 
             long materialPrice = 0l;
             //套餐固定商品加料
@@ -108,18 +94,13 @@ public class SetMealCalculation {
             }
 
             //如果是商品券商品，不重新计算套餐价格
-            if (StringUtils.isEmpty(cartGoods.getCouponCode())) {
-                Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
-                        productGroupTotalAmount + productComboTotalAmount + materialPrice;
-                cartGoods.setAmount(amount);
-            }
-            Long comboOriginalPriceAmount = null != cartGoods.getOriginalAmount() ? cartGoods.getOriginalAmount() :
-                    productComboTotalAmount;
-            cartGoods.setOriginalAmount(productGroupTotalAmount + comboOriginalPriceAmount + materialPrice);
-            cartGoods.setOriginalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :
-                    productComboTotalAmount);
-            cartGoods.setFinalPrice(null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() :
-                    productComboTotalAmount);
+            if (StringUtils.isEmpty(cartGoods.getCouponCode())
+                    || (null !=calculationDiscountResult.getMonthlyEnjoyCardDiscount()
+                    && StringUtils.isNotBlank(calculationDiscountResult.getMonthlyEnjoyCardDiscount().getCouponCode())
+                    && cartGoods.getCouponCode().equals(calculationDiscountResult.getMonthlyEnjoyCardDiscount().getCouponCode()))) {
+                cartGoods.setAmount(cartGoods.getAmount() + materialPrice);
+                cartGoods.setOriginalAmount(cartGoods.getOriginalAmount() + materialPrice);
+            }
 
             // 套餐（固定商品）现价
 //            String toastMsg = getTotalAmount(cartGoods, productGroupAmount, numberMap, goodsMap);
@@ -156,16 +137,8 @@ public class SetMealCalculation {
         // 套餐优惠明细
         for (CartGoods cartGoods : shoppingCartGoodsResponseVo.getProducts()) {
             if (ObjectUtils.equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType(), cartGoods.getGoodsType()) && StringUtils.isBlank(cartGoods.getCouponCode())) {
-                // discountAmount=(套餐原价-套餐售价)*数量
-                // productGroupDiscountAmount=可选商品现价总和
-                // discountAmount-productGroupDiscountAmount:  当前商品行套餐商品总优惠= 套餐原总价-套餐现总价-套餐可选商品的现总价
-//                int discountAmount = (cartGoods.getOriginalPrice().intValue() - cartGoods.getFinalPrice().intValue()) * cartGoods.getQty();
-                int productGroupDiscountAmount = cartGoods.getProductGroupList().stream().mapToInt(t -> t.getFinalPrice().intValue() * t.getQty()).sum();
-//                totalDiscountAmount += discountAmount - productGroupDiscountAmount * cartGoods.getQty();
                 // 添加套餐父商品
                 ShoppingCartGoodsDto.CartGoodsDetailDto parentCartGoods = shoppingCartMccafeAdapter.convertCartGoods2DetailGoods(cartGoods, apportionGoods,duplicateGoodsMap);
-//                parentCartGoods.setTotalDiscountAmount(parentCartGoods.getTotalDiscountAmount()+ cartGoods.getOriginalAmount().intValue() - cartGoods.getAmount().intValue());
-//                parentCartGoods.getActivityDiscountsDtos().add(getActivityDiscountsDto(discountAmount - productGroupDiscountAmount * cartGoods.getQty()));
                 // 添加套餐固定商品&可选商品: 做均摊
                 parentCartGoods.setComboProducts(shoppingCartMccafeAdapter.convertComboxGoods2DetailGoods(cartGoods,parentCartGoods.getTotalDiscountAmount()));
                 cartGoodsDetailDtos.add(parentCartGoods);