Merge branch 'exchangerate' into abroad_dev

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -350,8 +350,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			});
 		}
 		orderDon.setPayTitle(payTitle.toString());
-		//去除小数点
-		orderDon.setMoney(orderDon.getMoney().setScale(0, RoundingMode.HALF_UP));
+		if ("TWD".equals(payRequest.getCurrency())){
+			orderDon.setMoney(orderDon.getMoney().setScale(-2, RoundingMode.HALF_UP));
+		}
 		this.saveOrUpdate(orderDon);
 
 		if (orderDon.getIsDp()) {
@@ -815,8 +816,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setRealMoney(orderDon.getMoney());
 		//扣除使用优惠券、余额的订单金额
 		deductOrderMoney(orderDon, couponUser, payRequest.getBalance(), user, price, goodsDon.getType());
-		//去除小数点
-		orderDon.setMoney(orderDon.getMoney().setScale(0, RoundingMode.HALF_UP));
 		this.saveOrUpdate(orderDon);
 		//订单金额为0 且订单为已完成 更新虚物车票
 		if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {