|
|
@@ -1070,11 +1070,11 @@ public class DatabaseInitializer implements CommandLineRunner {
|
|
|
insertSysConfigSeed("renewal_discount_rate", "0.85", "续费折扣率");
|
|
|
insertSysConfigSeed("member_discount_standard", "0.9", "标准会员折扣率");
|
|
|
insertSysConfigSeed("member_discount_premium", "8000", "高级家庭会员商品折扣(bps)");
|
|
|
- insertSysConfigSeed("member_fee_family", "131400", "家庭会员年费(分)");
|
|
|
- insertSysConfigSeed("member_fee_family_yearly", "131400", "家庭会员年费(分)");
|
|
|
- insertSysConfigSeed("member_fee_family_monthly", "13140", "家庭会员月费(分)");
|
|
|
- insertSysConfigSeed("member_fee_family_quarterly", "32850", "家庭会员季费(分)");
|
|
|
- insertSysConfigSeed("member_upgrade_threshold", "131400", "自动升级家庭会员累计消费门槛(分)");
|
|
|
+ insertSysConfigSeed("member_fee_family", "198000", "家庭会员年费(分)");
|
|
|
+ insertSysConfigSeed("member_fee_family_yearly", "198000", "家庭会员年费(分)");
|
|
|
+ insertSysConfigSeed("member_fee_family_monthly", "19800", "家庭会员月费(分)");
|
|
|
+ insertSysConfigSeed("member_fee_family_quarterly", "59400", "家庭会员季费(分)");
|
|
|
+ insertSysConfigSeed("member_upgrade_threshold", "198000", "自动升级家庭会员累计消费门槛(分)");
|
|
|
insertSysConfigSeed("member_discount_family", "9000", "家庭会员商品折扣(bps)");
|
|
|
insertSysConfigSeed("member_fee_premium_monthly", "131400", "高级家庭会员月费(分)");
|
|
|
insertSysConfigSeed("member_fee_family_original_yearly", "199900", "家庭会员年费原价(分)");
|
|
|
@@ -3389,6 +3389,14 @@ insertSysConfigSeed("gift_membership_pay_price", "198000", "送会员商品达
|
|
|
migrateSalesAwardTierThresholds();
|
|
|
// 迁移429(家庭): 存量家庭名回填(家庭主账号已填真实姓名但家庭名仍为旧规则 → 按新规则回填「XX家庭」;DML,无 schema 变更,幂等)
|
|
|
migrateFamilyNameBackfill();
|
|
|
+
|
|
|
+ // 迁移432: SOP-MEMBER 成员上限收紧 + FAMILY 定价对齐(真库已有数据,INSERT IGNORE 不更新已有行,故用幂等 UPDATE)
|
|
|
+ // - membership_levels.max_children: FREE=0/BASIC=2/FAMILY=4/PREMIUM=10
|
|
|
+ // - membership_levels.FAMILY 价: 19800/59400/198000 分
|
|
|
+ // - sys_config: member_fee_family=member_fee_family_yearly=198000, member_fee_family_monthly=19800,
|
|
|
+ // member_fee_family_quarterly=59400, member_upgrade_threshold=198000
|
|
|
+ // - virtual_goods_config FAMILY: goods_price=198000(member1980 道具与下单金额自洽)
|
|
|
+ migrateSopMemberLimitAndFamilyPrice();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -3461,6 +3469,78 @@ insertSysConfigSeed("gift_membership_pay_price", "198000", "送会员商品达
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 迁移432: SOP-MEMBER 成员上限收紧 + FAMILY 定价对齐(幂等 UPDATE,真库已有数据时不依赖 INSERT IGNORE)。
|
|
|
+ * - membership_levels.max_children: FREE=0 / BASIC=2 / FAMILY=4 / PREMIUM=10
|
|
|
+ * - membership_levels.FAMILY 价: 19800/59400/198000 分(¥198/月·¥594/季·¥1980/年)
|
|
|
+ * - sys_config: member_fee_family=member_fee_family_yearly=member_upgrade_threshold=198000,
|
|
|
+ * member_fee_family_monthly=19800、member_fee_family_quarterly=59400
|
|
|
+ * - virtual_goods_config FAMILY: goods_price=198000(member1980 道具与下单金额自洽)
|
|
|
+ */
|
|
|
+ private void migrateSopMemberLimitAndFamilyPrice() {
|
|
|
+ // 成员上限收紧(幂等 UPDATE;存量家庭超限不删除,仅后续 addMember 拒绝新增)
|
|
|
+ String[][] maxChildrenTargets = {
|
|
|
+ {"FREE", "0"},
|
|
|
+ {"BASIC", "2"},
|
|
|
+ {"FAMILY", "4"},
|
|
|
+ {"PREMIUM", "10"}
|
|
|
+ };
|
|
|
+ for (String[] t : maxChildrenTargets) {
|
|
|
+ try {
|
|
|
+ int updated = jdbcTemplate.update(
|
|
|
+ "UPDATE membership_levels SET max_children = ?, updated_at = NOW() " +
|
|
|
+ "WHERE level_code = ? AND (max_children IS NULL OR max_children <> ?)",
|
|
|
+ Integer.valueOf(t[1]), t[0], Integer.valueOf(t[1]));
|
|
|
+ log.info("迁移432: membership_levels {}.max_children -> {},影响 {} 行", t[0], t[1], updated);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("迁移432: 更新 {} max_children 失败(幂等容忍): {}", t[0], e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // FAMILY 定价对齐 19800/59400/198000 分(幂等 UPDATE,覆盖种子/存量旧价)
|
|
|
+ try {
|
|
|
+ int updated = jdbcTemplate.update(
|
|
|
+ "UPDATE membership_levels SET price_monthly = 19800, price_quarterly = 59400, " +
|
|
|
+ "price_yearly = 198000, updated_at = NOW() " +
|
|
|
+ "WHERE level_code = 'FAMILY' AND " +
|
|
|
+ "(price_monthly IS NULL OR price_monthly <> 19800 OR price_quarterly IS NULL OR price_quarterly <> 59400 OR price_yearly IS NULL OR price_yearly <> 198000)");
|
|
|
+ log.info("迁移432: membership_levels FAMILY 定价 -> 19800/59400/198000,影响 {} 行", updated);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("迁移432: 更新 FAMILY 定价失败(幂等容忍): {}", e.getMessage());
|
|
|
+ }
|
|
|
+
|
|
|
+ // sys_config 家庭会员价格/门槛同步(幂等 UPDATE)
|
|
|
+ String[][] sysConfigTargets = {
|
|
|
+ {"member_fee_family", "198000"},
|
|
|
+ {"member_fee_family_yearly", "198000"},
|
|
|
+ {"member_fee_family_monthly", "19800"},
|
|
|
+ {"member_fee_family_quarterly", "59400"},
|
|
|
+ {"member_upgrade_threshold", "198000"}
|
|
|
+ };
|
|
|
+ for (String[] t : sysConfigTargets) {
|
|
|
+ try {
|
|
|
+ int updated = jdbcTemplate.update(
|
|
|
+ "UPDATE sys_config SET config_value = ?, updated_at = NOW() " +
|
|
|
+ "WHERE config_key = ? AND config_value <> ?",
|
|
|
+ t[1], t[0], t[1]);
|
|
|
+ log.info("迁移432: sys_config {} -> {},影响 {} 行", t[0], t[1], updated);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("迁移432: 更新 sys_config {} 失败(幂等容忍): {}", t[0], e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ // FAMILY 虚拟道具 goods_price 自洽(member1980 ¥1980 = 198000 分,与 FAMILY 年费一致)
|
|
|
+ try {
|
|
|
+ int updated = jdbcTemplate.update(
|
|
|
+ "UPDATE virtual_goods_config SET goods_price = 198000 " +
|
|
|
+ "WHERE goods_type = 'MEMBERSHIP' AND biz_key = 'FAMILY' " +
|
|
|
+ "AND (goods_price IS NULL OR goods_price <> 198000)");
|
|
|
+ log.info("迁移432: virtual_goods_config FAMILY goods_price -> 198000,影响 {} 行", updated);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("迁移432: 更新 FAMILY 虚拟道具 goods_price 失败(幂等容忍): {}", e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 迁移421: activities 表新增 audience_scope / audience_type 两列(A2)
|
|
|
* - audience_scope: all(默认,全部用户可参加) / member_only(仅会员可参加,后端硬门禁)
|
|
|
@@ -6592,8 +6672,8 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
|
|
|
// 迁移120: 插入 membership_levels 种子数据
|
|
|
try {
|
|
|
jdbcTemplate.execute("INSERT IGNORE INTO membership_levels (level_code, level_name, level_desc, price_monthly, price_quarterly, price_yearly, max_children, max_tasks_per_day, ai_review_enabled, priority_support, teacher_consultation) VALUES " +
|
|
|
- "('FREE', '免费会员', '基础免费功能', 0, 0, 0, 2, 5, 0, 0, 0), " +
|
|
|
- "('FAMILY', '家庭会员', '家庭会员全部功能', 13140, 32850, 131400, 6, 20, 1, 1, 1), " +
|
|
|
+ "('FREE', '免费会员', '基础免费功能', 0, 0, 0, 0, 5, 0, 0, 0), " +
|
|
|
+ "('FAMILY', '家庭会员', '家庭会员全部功能', 19800, 59400, 198000, 4, 20, 1, 1, 1), " +
|
|
|
"('PROVIDER', '标准会员', '标准会员服务', 13140, 32850, 131400, 10, 50, 1, 1, 1)");
|
|
|
log.info("已插入membership_levels种子数据");
|
|
|
} catch (Exception e) {
|
|
|
@@ -12170,7 +12250,7 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
|
|
|
"'9.9元/月体验版,解锁核心功能,限次使用AI与报告解读', " +
|
|
|
"990, " +
|
|
|
"'[\"free_activities\",\"free_courses\",\"discount_purchase\",\"invite_family\",\"mascot_ai_lite\",\"ai_report_reading_lite\",\"assessment_quota_lite\",\"health_report_upload_lite\",\"growth_plan_lite\",\"task_template_lite\",\"referral_commission\"]', " +
|
|
|
- "3, 3)");
|
|
|
+ "2, 3)");
|
|
|
log.info("迁移360: 已恢复 BASIC 体验会员等级");
|
|
|
} catch (Exception e) {
|
|
|
log.warn("迁移360: 恢复 BASIC 会员等级失败: {}", e.getMessage());
|