|
|
@@ -944,13 +944,18 @@ public class GroupRelationController {
|
|
|
List<Long> upgradeSkuIds = Jsons.parseList(renew.getUpgradeSkuIds(), Long.class);
|
|
|
//年付展示
|
|
|
MapBuilder builder = MapUtils.builder();
|
|
|
- if (minMonths.get() == 12) {
|
|
|
- builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
|
|
|
- if (renewSkuId != null) {
|
|
|
- upgradeSkuIds.remove(renewSkuId);
|
|
|
- }
|
|
|
- } else {
|
|
|
- builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterThan);
|
|
|
+// if (minMonths.get() == 12) {
|
|
|
+// builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
|
|
|
+// if (renewSkuId != null) {
|
|
|
+// upgradeSkuIds.remove(renewSkuId);
|
|
|
+// }
|
|
|
+// } else {
|
|
|
+// builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
|
|
|
+// }
|
|
|
+ //同续费时间规格
|
|
|
+ builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
|
|
|
+ if (renewSkuId != null) {
|
|
|
+ upgradeSkuIds.remove(renewSkuId);
|
|
|
}
|
|
|
List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, builder
|
|
|
.field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitNum, minNum.get()).op(Operator.GreaterEqual)
|