zoujiajian 4 месяцев назад
Родитель
Сommit
1e0f8b2288
1 измененных файлов с 17 добавлено и 15 удалено
  1. 17 15
      netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

+ 17 - 15
netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -1337,21 +1337,23 @@ public class CmsOrderController {
 					.last("limit 1"));
 					.last("limit 1"));
 			if (orderDonRenewRecord != null) {
 			if (orderDonRenewRecord != null) {
 				GroupsRelation relation = relationMapper.selectById(orderDon.getRelationId());
 				GroupsRelation relation = relationMapper.selectById(orderDon.getRelationId());
-				GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
-				Date expiryTime = relation.getExpiryTime();
-				DateTime lastExpiryTIme = DateUtil.offsetMonth(expiryTime, -sku.getMonths());
-
-				RenewOriOrderSkuDto renewOriOrderSkuDto = new RenewOriOrderSkuDto();
-				OriSkuDto oriSku = skuMapper.selectRenewOriSku(orderDonRenewRecord.getOriSkuId());
-				renewOriOrderSkuDto.setOriSku(oriSku);
-				renewOriOrderSkuDto.setLastExpiryTime(lastExpiryTIme);
-				ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class)
-						.eq(ChatgptUser::getRelationId, orderDon.getRelationId())
-						.last("limit 1"));
-				if (chatgptUser != null) {
-					renewOriOrderSkuDto.setOrderId(chatgptUser.getRenewOrderId());
-				}
-				return GatewayResponse.SUCCESS.newBuilder().toResult(renewOriOrderSkuDto);
+                if (relation != null) {
+                    GoodsDonSku sku = skuMapper.selectById(orderDon.getSkuId());
+                    Date expiryTime = relation.getExpiryTime();
+                    DateTime lastExpiryTIme = DateUtil.offsetMonth(expiryTime, -sku.getMonths());
+
+                    RenewOriOrderSkuDto renewOriOrderSkuDto = new RenewOriOrderSkuDto();
+                    OriSkuDto oriSku = skuMapper.selectRenewOriSku(orderDonRenewRecord.getOriSkuId());
+                    renewOriOrderSkuDto.setOriSku(oriSku);
+                    renewOriOrderSkuDto.setLastExpiryTime(lastExpiryTIme);
+                    ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class)
+                            .eq(ChatgptUser::getRelationId, orderDon.getRelationId())
+                            .last("limit 1"));
+                    if (chatgptUser != null) {
+                        renewOriOrderSkuDto.setOrderId(chatgptUser.getRenewOrderId());
+                    }
+                    return GatewayResponse.SUCCESS.newBuilder().toResult(renewOriOrderSkuDto);
+                }
 			}
 			}
 		}
 		}
 		return GatewayResponse.SUCCESS.newBuilder().toResult();
 		return GatewayResponse.SUCCESS.newBuilder().toResult();