zoujiajian 2 anos atrás
pai
commit
4425047c95

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

@@ -3246,8 +3246,8 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				Date expiryTime = groupsRelation.getExpiryTime();
 				//剩余多少天
 				DateTime now = DateTime.now();
-				long day = DateUtil.between(now, expiryTime, DateUnit.DAY) + 1;
-				if (day <= 0) {
+				long remainDay = DateUtil.between(now, expiryTime, DateUnit.DAY) + 1;
+				if (remainDay <= 0) {
 					throw BusinessRuntimeException.getInstance("车票已过期");
 				}
 				Long upgradeSkuId = upgradePackage.getUpgradeSkuId();
@@ -3277,7 +3277,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				//每日单价
 				BigDecimal singlePrice = differPrice.divide(BigDecimal.valueOf(totalDays), 0, RoundingMode.HALF_UP);
 
-				BigDecimal payUpgradePackagePrice = singlePrice.multiply(BigDecimal.valueOf(day));
+				BigDecimal payUpgradePackagePrice = singlePrice.multiply(BigDecimal.valueOf(remainDay));
+				//车票当日买 当天升级 用套餐包原价
+				if (totalDays == remainDay) {
+					payUpgradePackagePrice = differPrice;
+				}
 				if (payRequest.getDonMoney().compareTo(payUpgradePackagePrice) < 0) {
 					payRequest.setDonMoney(payUpgradePackagePrice);
 				}