|
|
@@ -776,9 +776,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
|
|
|
if (price.compareTo(BigDecimal.ZERO) == 0){
|
|
|
price = sku.getPrice().multiply(payRequest.getRate());
|
|
|
- if ("TWD".equals(payRequest.getCurrency())){
|
|
|
- price = price.setScale(-2, RoundingMode.HALF_UP);
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
/* 生成订单 */
|
|
|
@@ -816,6 +813,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
|
|
|
orderDon.setRealMoney(orderDon.getMoney());
|
|
|
//扣除使用优惠券、余额的订单金额
|
|
|
deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, price, goodsDon.getType());
|
|
|
+ if ("TWD".equals(payRequest.getCurrency())){
|
|
|
+ orderDon.setMoney(orderDon.getMoney().setScale(-2, RoundingMode.HALF_UP));
|
|
|
+ }
|
|
|
this.saveOrUpdate(orderDon);
|
|
|
//订单金额为0 且订单为已完成 更新虚物车票
|
|
|
if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
|