Explorar el Código

fix 金额小数位进位、paypal货币单位

zoujiajian hace 2 años
padre
commit
7e688c0c2c

+ 4 - 0
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()) {
@@ -810,6 +812,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) {

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/paypal/PayPalService.java

@@ -138,7 +138,7 @@ public class PayPalService{
 
         //订单价格
         Amount amount = new Amount();
-        amount.setCurrency("USD");
+        amount.setCurrency(orderDon.getCurrency());
         // 支付的总价,paypal会校验 total = subTotal + tax + ...
         BigDecimal totalMoney = orderDon.getMoney().divide(new BigDecimal(100), 2, RoundingMode.HALF_DOWN);
         amount.setTotal(totalMoney.toString());