|
@@ -331,16 +331,32 @@ public class MembershipController {
|
|
|
plan.put("yearly", yearlyStr != null ? Integer.parseInt(yearlyStr) : 131400);
|
|
plan.put("yearly", yearlyStr != null ? Integer.parseInt(yearlyStr) : 131400);
|
|
|
plan.put("monthly", null);
|
|
plan.put("monthly", null);
|
|
|
plan.put("quarterly", null);
|
|
plan.put("quarterly", null);
|
|
|
|
|
+ // 原价(划线价,仅展示)
|
|
|
|
|
+ String origYearlyStr = sysConfigService.getValue("member_fee_family_original_yearly");
|
|
|
|
|
+ if (origYearlyStr == null) origYearlyStr = sysConfigService.getValue("member_fee_family_original");
|
|
|
|
|
+ plan.put("originalYearly", origYearlyStr != null ? Integer.parseInt(origYearlyStr) : null);
|
|
|
|
|
+ plan.put("originalMonthly", null);
|
|
|
|
|
+ plan.put("originalQuarterly", null);
|
|
|
} else if ("PREMIUM".equals(level.getLevelCode())) {
|
|
} else if ("PREMIUM".equals(level.getLevelCode())) {
|
|
|
String yearlyStr = sysConfigService.getValue("member_fee_premium");
|
|
String yearlyStr = sysConfigService.getValue("member_fee_premium");
|
|
|
String monthlyStr = sysConfigService.getValue("member_fee_premium_monthly");
|
|
String monthlyStr = sysConfigService.getValue("member_fee_premium_monthly");
|
|
|
plan.put("yearly", yearlyStr != null ? Integer.parseInt(yearlyStr) : 1316800);
|
|
plan.put("yearly", yearlyStr != null ? Integer.parseInt(yearlyStr) : 1316800);
|
|
|
plan.put("monthly", monthlyStr != null ? Integer.parseInt(monthlyStr) : 131400);
|
|
plan.put("monthly", monthlyStr != null ? Integer.parseInt(monthlyStr) : 131400);
|
|
|
plan.put("quarterly", 0);
|
|
plan.put("quarterly", 0);
|
|
|
|
|
+ // 原价(划线价,仅展示)
|
|
|
|
|
+ String origYearlyStr = sysConfigService.getValue("member_fee_premium_original");
|
|
|
|
|
+ String origMonthlyStr = sysConfigService.getValue("member_fee_premium_original_monthly");
|
|
|
|
|
+ plan.put("originalYearly", origYearlyStr != null ? Integer.parseInt(origYearlyStr) : null);
|
|
|
|
|
+ plan.put("originalMonthly", origMonthlyStr != null ? Integer.parseInt(origMonthlyStr) : null);
|
|
|
|
|
+ plan.put("originalQuarterly", null);
|
|
|
} else {
|
|
} else {
|
|
|
plan.put("monthly", level.getPriceMonthly());
|
|
plan.put("monthly", level.getPriceMonthly());
|
|
|
plan.put("quarterly", level.getPriceQuarterly());
|
|
plan.put("quarterly", level.getPriceQuarterly());
|
|
|
plan.put("yearly", level.getPriceYearly());
|
|
plan.put("yearly", level.getPriceYearly());
|
|
|
|
|
+ // 其他等级无原价定义
|
|
|
|
|
+ plan.put("originalYearly", null);
|
|
|
|
|
+ plan.put("originalMonthly", null);
|
|
|
|
|
+ plan.put("originalQuarterly", null);
|
|
|
}
|
|
}
|
|
|
plans.add(plan);
|
|
plans.add(plan);
|
|
|
}
|
|
}
|