|
|
@@ -311,15 +311,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (userInfo.getPackageId() != 0) {
|
|
|
UpgradePackage upgradePackage = upgradePackageMapper.selectById(userInfo.getPackageId());
|
|
|
ticket.setPackagePrice(upgradePackage.getPrice());
|
|
|
- //套餐升级的规格
|
|
|
- UpgradeOrderDon upgradeOrderDon = upgradeOrderDonMapper.selectOne(Wrappers.lambdaQuery(UpgradeOrderDon.class)
|
|
|
- .in(UpgradeOrderDon::getUserId, userIds)
|
|
|
- .eq(UpgradeOrderDon::getRelationId, ticket.getRelationId())
|
|
|
- .eq(UpgradeOrderDon::getPackageId, userInfo.getPackageId())
|
|
|
- .eq(UpgradeOrderDon::getStatus, UpgradeOrderDon.Status.complete)
|
|
|
- .orderByDesc(UpgradeOrderDon::getId)
|
|
|
- .last("limit 1"));
|
|
|
- Long upgradeOrderDonSkuId = upgradeOrderDon.getSkuId();
|
|
|
+ Long upgradeOrderDonSkuId = upgradePackage.getUpgradeSkuId();
|
|
|
GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, upgradeOrderDonSkuId).build());
|
|
|
Optional.ofNullable(orderDonRenewRecordMapper.selectOne(Wrappers.lambdaQuery(OrderDonRenewRecord.class)
|
|
|
.eq(OrderDonRenewRecord::getOrderId, userInfo.getRenewOrderId())
|