Merge branch 'dev' into test

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

@@ -146,11 +146,14 @@ 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);
+                                }
                             }
+
                         });
                     }
                     return map;
@@ -175,7 +178,7 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                         return map;
                         //标签绑定了套餐，套餐没开启，小时
                     } else {
-                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard)) {
+                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && new BigDecimal(label.getDuration()).compareTo(BigDecimal.ONE) >= 0) {
                             consumerMonthlyCardList.add(consumerMonthlyCard.getId());
                             map.put("consumerMonthlyCard", consumerMonthlyCardList);
                         }