Merge remote-tracking branch 'origin/abroad_dev' into abroad_dev

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

@@ -350,6 +350,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			});
 		}
 		orderDon.setPayTitle(payTitle.toString());
+		//去除小数点
+		orderDon.setMoney(orderDon.getMoney().setScale(0, RoundingMode.HALF_UP));
 		this.saveOrUpdate(orderDon);
 
 		if (orderDon.getIsDp()) {
@@ -813,6 +815,8 @@ 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) {