fix 悦享卡费用配置Apollo

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

@@ -321,11 +321,14 @@ public class ShoppingCartMCoffeeServiceImpl {
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
         }
         String code = "";
+        Long payCardPrice =null;
         if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
             if (Objects.equals(buyMonthlyCard, "2")) {
                 code = mcCafeUniversalCouponCode;
+                payCardPrice = Long.valueOf(payCardFee);
             } else if ( Objects.equals(buyMonthlyCard, "3")){
                 code = shoppingCartInfoRequestVo.getMonthlyCardCode();
+                payCardPrice = Long.valueOf(payCardFee);
             }
         }
         // 当couponCode不为空时，需参与价格计算
@@ -333,7 +336,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
-                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, Long.valueOf(payCardFee));
+                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, payCardPrice);
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
 
@@ -496,11 +499,14 @@ public class ShoppingCartMCoffeeServiceImpl {
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, tableNumber, shoppingCartBaseService);
 
         String code = "";
+        Long payCardPrice =null;
         if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
             if (Objects.equals(buyMonthlyCard, "2")) {
                 code = mcCafeUniversalCouponCode;
+                payCardPrice = Long.valueOf(payCardFee);
             } else if ( Objects.equals(buyMonthlyCard, "3")){
                 code = shoppingCartInfoRequestVo.getMonthlyCardCode();
+                payCardPrice = Long.valueOf(payCardFee);
             }
         }
 
@@ -513,7 +519,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 //        packgeAdditional(shoppingCartInfoRequestVo, premiumExchangeActivity);
         // 促销活动的优惠金额计算
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscount = calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
-                cartGoodsList, coupons, sendGoodsList, shoppingCartGoodsResponseVo, Long.valueOf(payCardFee));
+                cartGoodsList, coupons, sendGoodsList, shoppingCartGoodsResponseVo, payCardPrice);
 
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);