Merge branch 'mj' into dev

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

@@ -231,10 +231,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				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<UpgradeOrderDon> upgradeOrderDons = upgradeOrderDonMapper.selectList(Wrappers.lambdaQuery(UpgradeOrderDon.class).eq(UpgradeOrderDon::getUserId, ticket.getUserId()).eq(UpgradeOrderDon::getGoodsId, ticket.getGoodsId()));
-				if (CollectionUtil.isNotEmpty(upgradeOrderDons)) {
-					upgradeOrderDons.stream().map(UpgradeOrderDon::getNum).reduce(Integer::sum).ifPresent(e -> ticket.setMjFastNum(e + ticket.getMjFastNum()));
-				}
 			}
 			List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
 			ticket.setRelationViews(relationUserViews);