Skip to content

O
order-group
Commit 7dd75945 by 缪晖
Options

代码冲突处理

parent 53f155dd
Showing with 2 additions and 2 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -1709,8 +1709,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1709,8 +1709,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
shoppingCartGoodsResponseVo.setTotalAmount((orderAmount.longValue()-svcPayAmount.longValue())); shoppingCartGoodsResponseVo.setTotalAmount((orderAmount.longValue()-svcPayAmount.longValue()));
} }
BigDecimal bigDecimal = new BigDecimal(svcPayAmount); BigDecimal bigDecimal = new BigDecimal(svcPayAmount);
BigDecimal amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP); String amountStr = bigDecimal.divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString();
shoppingCartGoodsResponseVo.setSvcPayAmount(amountStr.intValue()); shoppingCartGoodsResponseVo.setSvcPayAmount(amountStr);
shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + amountStr); shoppingCartGoodsResponseVo.setSvcDiscountDesc("储值卡支付￥" + amountStr);
} }
else { else {
......
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