zoujiajian vor 2 Jahren
Ursprung
Commit
6bd20ce0d7

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

@@ -3248,7 +3248,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				Date expiryTime = groupsRelation.getExpiryTime();
 				//剩余多少天
 				DateTime now = DateTime.now();
-				long day = DateUtil.between(now, expiryTime, DateUnit.DAY);
+				long day = DateUtil.between(now, expiryTime, DateUnit.DAY) + 1;
 				if (day <= 0) {
 					throw BusinessRuntimeException.getInstance("车票已过期");
 				}
@@ -3256,7 +3256,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				BigDecimal upgradePackagePrice = upgradePackage.getPrice();
 				//自然月差价
 				int thisMonthDays = DateUtil.endOfMonth(now).dayOfMonth();
-				BigDecimal singlePrice = upgradePackagePrice.divide(BigDecimal.valueOf(thisMonthDays));
+				BigDecimal singlePrice = upgradePackagePrice.divide(BigDecimal.valueOf(thisMonthDays), 0, RoundingMode.DOWN);
 
 				BigDecimal payUpgradePackagePrice = singlePrice.multiply(BigDecimal.valueOf(day));
 				if (payRequest.getDonMoney().compareTo(payUpgradePackagePrice) < 0) {