Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/ConsumerMonthlyCardServiceImpl.java

@@ -133,7 +133,11 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
         if (ObjectUtil.isNotEmpty(consumerMember)) {
             SRoom room = roomService.getById(monthlyCardRequest.getRoomId());
             consumerMonthlyCard = baseMapper.selectOne(new LambdaQueryWrapper<ConsumerMonthlyCard>().eq(ConsumerMonthlyCard::getConsumerId, user.getId()).gt(ConsumerMonthlyCard::getFreeDuration, 0));
-            consumerSecondaryCard = consumerSecondaryCardService.list(new LambdaQueryWrapper<ConsumerSecondaryCard>().eq(ConsumerSecondaryCard::getConsumerId, user.getId()).orderByAsc(ConsumerSecondaryCard::getNumber));
+            consumerSecondaryCard = consumerSecondaryCardService.list(new LambdaQueryWrapper<ConsumerSecondaryCard>()
+                    .eq(ConsumerSecondaryCard::getConsumerId, user.getId())
+                    .gt(ConsumerSecondaryCard::getNumber, 0)
+                    .orderByAsc(ConsumerSecondaryCard::getNumber)
+            );
             if (!ObjectUtils.isEmpty(monthlyCardRequest.getRoomLabelId())) {
                 RoomLabel roomLabel = roomLabelService.selectRoomLabelById(monthlyCardRequest.getRoomLabelId());
                 Label label = labelService.getById(roomLabel.getLabelId());