Merge branch 'renew_upgrade' into pre

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

@@ -3745,6 +3745,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		orderDon.setUserId(userId);
 		orderDon.setGoodsId(goodsDonSku.getGoodsId());
 		orderDon.setRelationId(relationId);
+		orderDon.setSkuId(renewSkuId);
 		//续费订单
 		orderDon.setOrderType(2);
 		RenewUpgradePackage renewUpgradePackage = renewUpgradePackageMapper.selectOne(Wrappers.lambdaQuery(RenewUpgradePackage.class)

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -598,6 +598,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	@Override
 	public void adjustGroupsParkingTime(Long relationId, GoodsDonSku sku) {
+		if (sku == null) {
+			return;
+		}
 		Long skuId = sku.getId();
 		//更新GPT Plus10人、4人月付车队状态 待优化
 		if (skuId == 161l || skuId == 178l || skuId == 422l || skuId == 423l) {