zoujiajian пре 2 година
родитељ
комит
4446e3e790

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

@@ -1079,9 +1079,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (payRequest.getPackageId() != null && payRequest.getPackageId() != 0 && orderDon.getGoodsId() == 18) {
 		if (payRequest.getPackageId() != null && payRequest.getPackageId() != 0 && orderDon.getGoodsId() == 18) {
 			//记录续费升级订单 目前升级规格续费
 			//记录续费升级订单 目前升级规格续费
 			RenewUpgradePackage renewUpgradePackage = renewUpgradePackageMapper.selectById(payRequest.getPackageId());
 			RenewUpgradePackage renewUpgradePackage = renewUpgradePackageMapper.selectById(payRequest.getPackageId());
-			//无优惠折扣 但订单可使用优惠码
-			renewUpgradePackage.setDiscount(BigDecimal.ONE);
-			recordRenewOrderDon(orderDon, renewUpgradePackage, groupsTrips);
+			if (renewUpgradePackage != null) {
+				//无优惠折扣 但订单可使用优惠码
+				renewUpgradePackage.setDiscount(BigDecimal.ONE);
+				recordRenewOrderDon(orderDon, renewUpgradePackage, groupsTrips);
+			}
 		}
 		}
 		return orderDon;
 		return orderDon;
 	}
 	}