Merge branch 'dev' into test

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

@@ -185,10 +185,12 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                         if (CollectionUtil.isNotEmpty(consumerSecondaryCard)) {
                             //过滤时长相等的
                             consumerSecondaryCard.stream().forEach(item -> {
-                                if (Objects.equals(item.getSingleDuration(), Integer.valueOf(label.getDuration()))
-                                        && item.getSingleAmount().compareTo(new BigDecimal(label.getDuration()).multiply(room.getPrice())) >= 0) {
-                                    consumerSecondaryCardList.add(item.getId());
-                                    map.put("consumerSecondaryCard", consumerSecondaryCardList);
+                                if (new BigDecimal(label.getDuration()).compareTo(BigDecimal.ONE) >= 0) {
+                                    if (Objects.equals(item.getSingleDuration(), Integer.valueOf(label.getDuration()))
+                                            && item.getSingleAmount().compareTo(new BigDecimal(label.getDuration()).multiply(room.getPrice())) >= 0) {
+                                        consumerSecondaryCardList.add(item.getId());
+                                        map.put("consumerSecondaryCard", consumerSecondaryCardList);
+                                    }
                                 }
                             });
                         }