|
@@ -102,7 +102,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
|
|
|
|
|
private final UserLoginRecordService userLoginRecordService;
|
|
private final UserLoginRecordService userLoginRecordService;
|
|
|
|
|
|
|
|
- private final UpgradeOrderDonMapper upgradeOrderDonMapper;
|
|
|
|
|
|
|
+ private final UpgradePackageMapper upgradePackageMapper;
|
|
|
|
|
|
|
|
private final static String VERIFY_CODE_SECRET = "q1w2e3";
|
|
private final static String VERIFY_CODE_SECRET = "q1w2e3";
|
|
|
|
|
|
|
@@ -224,9 +224,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
ticket.setPayTime(payTime);
|
|
ticket.setPayTime(payTime);
|
|
|
}
|
|
}
|
|
|
if (ticket.getGoodsId() == 26 && ticket.getIsMirror()){
|
|
if (ticket.getGoodsId() == 26 && ticket.getIsMirror()){
|
|
|
- List<GoodsDonSku> goodsDonSkus = goodsDonSkuMapper.selectList(Wrappers.lambdaQuery(GoodsDonSku.class).eq(GoodsDonSku::getId, ticket.getSkuId()));
|
|
|
|
|
- if (CollectionUtil.isNotEmpty(goodsDonSkus)){
|
|
|
|
|
- goodsDonSkus.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
|
|
|
|
|
|
|
+ List<UpgradePackage> upgradePackages = upgradePackageMapper.selectList(Wrappers.lambdaQuery(UpgradePackage.class).eq(UpgradePackage::getSkuId, ticket.getSkuId()));
|
|
|
|
|
+ if (CollectionUtil.isNotEmpty(upgradePackages)){
|
|
|
|
|
+ upgradePackages.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setMjPackagePrice);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|