|
@@ -1376,10 +1376,12 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
|
|
|
.eq(ChatgptUser::getRelationId, orderDon.getRelationId())
|
|
.eq(ChatgptUser::getRelationId, orderDon.getRelationId())
|
|
|
.last("limit 1"));
|
|
.last("limit 1"));
|
|
|
Long presentRenewSkuId = chatgptUser.getRenewSkuId();
|
|
Long presentRenewSkuId = chatgptUser.getRenewSkuId();
|
|
|
- //存在不同升级套餐
|
|
|
|
|
- GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
|
|
|
|
|
- if (!ObjectUtil.equal(presentRenewSkuId, skuId)) {
|
|
|
|
|
- throw BusinessRuntimeException.getInstance("请先退掉用户目前续费升级的{0}规格", presentRenewSku.getSpecVal());
|
|
|
|
|
|
|
+ if (presentRenewSkuId != null) {
|
|
|
|
|
+ //存在不同升级套餐
|
|
|
|
|
+ GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
|
|
|
|
|
+ if (!ObjectUtil.equal(presentRenewSkuId, skuId)) {
|
|
|
|
|
+ throw BusinessRuntimeException.getInstance("请先退掉用户目前续费升级的{0}规格", presentRenewSku.getSpecVal());
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|