fix 随单购go

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

@@ -89,7 +89,7 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
 
     /**
      * 随单购是否购买月享卡
-     * 1:购买，2：不购买
+     * 1:不购买，2：月卡续费，3：新购月卡
      */
     private String buyMonthlyCard;
     /**

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

@@ -307,6 +307,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();
         String receiveId = shoppingCartInfoRequestVo.getReceiveId();
         Long payCardFee = shoppingCartInfoRequestVo.getPayCardFee();
+        String buyMonthlyCard = shoppingCartInfoRequestVo.getBuyMonthlyCard();
 
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, sessionId, "", shoppingCartBaseService);
@@ -318,8 +319,16 @@ public class ShoppingCartMCoffeeServiceImpl {
             // 重新存储最新购物车
             assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, "", shoppingCartBaseService);
         }
+        String code = "";
+        if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
+            if (Objects.equals(buyMonthlyCard, "2")) {
+                code = mcCafeUniversalCouponCode;
+            } else if ( Objects.equals(buyMonthlyCard, "3")){
+                code = shoppingCartInfoRequestVo.getMonthlyCardCode();
+            }
+        }
         // 当couponCode不为空时，需参与价格计算
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,shoppingCartInfoRequestVo.getBuyMonthlyCard());
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList, code);
 
         // 促销活动的优惠金额计算
         calculationService.updateShoppingCartGoodsDiscount(partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), menuType, receiveId, null,
@@ -447,6 +456,7 @@ public class ShoppingCartMCoffeeServiceImpl {
         String menuType = shoppingCartInfoRequestVo.getMenuType();
         Integer orderType = shoppingCartInfoRequestVo.getOrderType();
         String receiveId = shoppingCartInfoRequestVo.getReceiveId();
+        String buyMonthlyCard = shoppingCartInfoRequestVo.getBuyMonthlyCard();
 
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCart(partnerId, storeId, userId, null, tableNumber, shoppingCartBaseService);
@@ -484,8 +494,17 @@ public class ShoppingCartMCoffeeServiceImpl {
         // 重新存储最新购物车
         assortmentSdkService.setShoppingCart(partnerId, storeId, userId, cartGoodsList, sessionId, tableNumber, shoppingCartBaseService);
 
+        String code = "";
+        if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
+            if (Objects.equals(buyMonthlyCard, "2")) {
+                code = mcCafeUniversalCouponCode;
+            } else if ( Objects.equals(buyMonthlyCard, "3")){
+                code = shoppingCartInfoRequestVo.getMonthlyCardCode();
+            }
+        }
+
         // 当couponCode不为空时，需参与价格计算
-        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,shoppingCartInfoRequestVo.getBuyMonthlyCard());
+        List<ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon> coupons = getCoupon(couponCode, null, cartGoodsList,code);
 
         //加价购商品
         List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();
@@ -1111,9 +1130,9 @@ public class ShoppingCartMCoffeeServiceImpl {
             coupon.setActivityCode(activityCode);
             coupons.add(coupon);
         }
-        if (StringUtils.isNotEmpty(buyMonthlyCard) && Objects.equals(buyMonthlyCard, "1")){
+        if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
             ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon coupon = new ActivityCalculationDiscountRequestDto.CalculationDiscountCoupon();
-            coupon.setCode(mcCafeUniversalCouponCode);
+            coupon.setCode(buyMonthlyCard);
             coupons.add(coupon);
         }