Merge branch 'dev' into test

163f9492 · 吕明尚 · e5a546a4 · 6abd2387 · 163f9492
Commit 163f9492 authored Nov 08, 2024 by 吕明尚
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ConsumerMonthlyCardServiceImpl.java ...e/system/service/impl/ConsumerMonthlyCardServiceImpl.java +2 -2

No files found.
--- a/share-system/src/main/java/share/system/service/impl/ConsumerMonthlyCardServiceImpl.java
+++ b/share-system/src/main/java/share/system/service/impl/ConsumerMonthlyCardServiceImpl.java
@@ -176,7 +176,7 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                                }
                            });
                        }
-                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(byId.getDuration())) == 0) {
+                        if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(byId.getDuration())) >= 0) {
                            consumerMonthlyCardList.add(consumerMonthlyCard.getId());
                            map.put("consumerMonthlyCard", consumerMonthlyCardList);
                        }
@@ -215,7 +215,7 @@ public class ConsumerMonthlyCardServiceImpl extends ServiceImpl<ConsumerMonthlyC
                        }
                    });
                }
-                if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(pack.getDuration())) == 0) {
+                if (ObjectUtil.isNotEmpty(consumerMonthlyCard) && consumerMonthlyCard.getFreeDuration().compareTo(new BigDecimal(pack.getDuration())) >= 0) {
                    consumerMonthlyCardList.add(consumerMonthlyCard.getId());
                    map.put("consumerMonthlyCard", consumerMonthlyCardList);
                }