fix 悦享卡费用配置Apollo

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

@@ -96,10 +96,6 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      * 月享卡卡号
      */
     private String monthlyCardCode;
-    /**
-     * 购买月卡费用(分)
-     */
-    private Long payCardFee;
 
     @Data
     public final static class SendGoods {

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

@@ -90,6 +90,8 @@ public class ShoppingCartMCoffeeServiceImpl {
 
     @Value("${mccafe.universal.coupon.code}")
     private String mcCafeUniversalCouponCode;
+    @Value("${mccafe.pay.card.fee}")
+    private String payCardFee;
 
     /**
      * 添加商品、超值加购、商品券
@@ -306,7 +308,6 @@ public class ShoppingCartMCoffeeServiceImpl {
         String menuType = shoppingCartInfoRequestVo.getMenuType();
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();
         String receiveId = shoppingCartInfoRequestVo.getReceiveId();
-        Long payCardFee = shoppingCartInfoRequestVo.getPayCardFee();
         String buyMonthlyCard = shoppingCartInfoRequestVo.getBuyMonthlyCard();
 
         // 获取购物车商品
@@ -332,7 +333,7 @@ public class ShoppingCartMCoffeeServiceImpl {
 
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
-                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, payCardFee);
+                cartGoodsList, coupons, new ArrayList<>(), shoppingCartGoodsResponseVo, Long.valueOf(payCardFee));
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
 
@@ -512,7 +513,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,shoppingCartInfoRequestVo.getPayCardFee());
+                cartGoodsList, coupons, sendGoodsList, shoppingCartGoodsResponseVo, Long.valueOf(payCardFee));
 
         //设置更新响应信息
         setAddAndUpdateResponse(shoppingCartGoodsResponseVo, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);