Merge branch 'dev' into test

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

@@ -146,8 +146,8 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                     if (CollectionUtil.isNotEmpty(consumerSecondaryCard)) {
                         //过滤时长相等的
                         consumerSecondaryCard.stream().forEach(item -> {
-                            if (Objects.equals(item.getSingleDuration(), Integer.valueOf(roomLabel.getPromotionDuration()))
-                                    && item.getSingleAmount().compareTo(new BigDecimal(roomLabel.getPromotionDuration()).multiply(room.getPrice())) >= 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);
                             }
@@ -179,6 +179,16 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                             consumerMonthlyCardList.add(consumerMonthlyCard.getId());
                             map.put("consumerMonthlyCard", consumerMonthlyCardList);
                         }
+                        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);
+                                }
+                            });
+                        }
                         return map;
                     }
                 }