Skip to content

O
order-group
Commit 50372a83 by 徐康
Options

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

parents 8cdaa0cd ddb73492
Showing with 4 additions and 4 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -324,10 +324,10 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -324,10 +324,10 @@ public class ShoppingCartMCoffeeServiceImpl {
Long payCardPrice =null; Long payCardPrice =null;
if (StringUtils.isNotEmpty(buyMonthlyCard) ) { if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
if (Objects.equals(buyMonthlyCard, "2")) { if (Objects.equals(buyMonthlyCard, "2")) {
code = mcCafeUniversalCouponCode; code = shoppingCartInfoRequestVo.getMonthlyCardCode();
payCardPrice = Long.valueOf(payCardFee); payCardPrice = Long.valueOf(payCardFee);
} else if ( Objects.equals(buyMonthlyCard, "3")){ } else if ( Objects.equals(buyMonthlyCard, "3")){
code = shoppingCartInfoRequestVo.getMonthlyCardCode(); code = mcCafeUniversalCouponCode;
payCardPrice = Long.valueOf(payCardFee); payCardPrice = Long.valueOf(payCardFee);
} }
} }
...@@ -502,10 +502,10 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -502,10 +502,10 @@ public class ShoppingCartMCoffeeServiceImpl {
Long payCardPrice =null; Long payCardPrice =null;
if (StringUtils.isNotEmpty(buyMonthlyCard) ) { if (StringUtils.isNotEmpty(buyMonthlyCard) ) {
if (Objects.equals(buyMonthlyCard, "2")) { if (Objects.equals(buyMonthlyCard, "2")) {
code = mcCafeUniversalCouponCode; code = shoppingCartInfoRequestVo.getMonthlyCardCode();
payCardPrice = Long.valueOf(payCardFee); payCardPrice = Long.valueOf(payCardFee);
} else if ( Objects.equals(buyMonthlyCard, "3")){ } else if ( Objects.equals(buyMonthlyCard, "3")){
code = shoppingCartInfoRequestVo.getMonthlyCardCode(); code = mcCafeUniversalCouponCode;
payCardPrice = Long.valueOf(payCardFee); payCardPrice = Long.valueOf(payCardFee);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment