Merge remote-tracking branch 'origin/2020/10/06-随单购买月享卡-huiyang' into 2020/10/06-随单购买月享卡-huiyang

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

@@ -324,10 +324,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         Long payCardPrice =null;
         if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
             if (Objects.equals(buyMonthlyCard, "2")) {
-                code = mcCafeUniversalCouponCode;
+                code = shoppingCartInfoRequestVo.getMonthlyCardCode();
                 payCardPrice = Long.valueOf(payCardFee);
             } else if ( Objects.equals(buyMonthlyCard, "3")){
-                code = shoppingCartInfoRequestVo.getMonthlyCardCode();
+                code = mcCafeUniversalCouponCode;
                 payCardPrice = Long.valueOf(payCardFee);
             }
         }
@@ -502,10 +502,10 @@ public class ShoppingCartMCoffeeServiceImpl {
         Long payCardPrice =null;
         if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
             if (Objects.equals(buyMonthlyCard, "2")) {
-                code = mcCafeUniversalCouponCode;
+                code = shoppingCartInfoRequestVo.getMonthlyCardCode();
                 payCardPrice = Long.valueOf(payCardFee);
             } else if ( Objects.equals(buyMonthlyCard, "3")){
-                code = shoppingCartInfoRequestVo.getMonthlyCardCode();
+                code = mcCafeUniversalCouponCode;
                 payCardPrice = Long.valueOf(payCardFee);
             }
         }