|
|
@@ -4,6 +4,7 @@ import com.etotem.cfc.mapper.*;
|
|
|
import com.etotem.cfc.service.CfLegacyLedgerMigrationService;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
+import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import org.slf4j.Logger;
|
|
|
@@ -24,6 +25,7 @@ import java.sql.PreparedStatement;
|
|
|
import java.sql.SQLException;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.regex.Pattern;
|
|
|
@@ -3403,6 +3405,12 @@ insertSysConfigSeed("gift_membership_pay_price", "198000", "送会员商品达
|
|
|
|
|
|
// 迁移436: products 表添加营养数据字段(热量/蛋白质/脂肪/碳水/膳食纤维/营养标签)
|
|
|
migrateProductNutritionFields();
|
|
|
+
|
|
|
+ // 迁移437: 为打卡类规则补 levels 等级金额默认值(T3,幂等读-合并-写)
|
|
|
+ // 背景:T1 引入 computeAmount 等级金额通道 params_json.levels[levelCode];为存量规则补默认矩阵。
|
|
|
+ // 实现:params_json 为 TEXT(MySQL 5.7 无 JSON_MERGEREPLACE),用 Java 读-合并-写,
|
|
|
+ // 仅在 levels 缺失对应键时补默认值,保留其他键(如 daily_limit_by_tier),幂等可重入。
|
|
|
+ migrateCfEarnRuleLevelDefaults();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -3538,6 +3546,113 @@ insertSysConfigSeed("gift_membership_pay_price", "198000", "送会员商品达
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 迁移437: 为打卡类规则补 levels 等级金额默认值(T3)。
|
|
|
+ *
|
|
|
+ * <p>等级矩阵(廖总拍板:家庭=非会员×2、超级=非会员×5):
|
|
|
+ * F14/F15 基准 2 → 家庭 4 / 超级 10;F16 基准 5 → 家庭 10 / 超级 25;
|
|
|
+ * F05/F07/F08 基准 1 → 家庭 2 / 超级 5。</p>
|
|
|
+ *
|
|
|
+ * <p>params_json 为 TEXT(MySQL 5.7 无 JSON_MERGEREPLACE),采用 Java 侧读-合并-写:
|
|
|
+ * 仅在 {@code levels} 缺失对应键时补默认值,保留其它键(如 daily_limit_by_tier),
|
|
|
+ * 幂等可重入(再次执行不产生变更)。</p>
|
|
|
+ */
|
|
|
+ private void migrateCfEarnRuleLevelDefaults() {
|
|
|
+ if (!tableExists("cf_earn_rule")) {
|
|
|
+ log.warn("迁移437: cf_earn_rule 表不存在,跳过 levels 默认值迁移");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ Map<String, Map<String, Integer>> defaults = new LinkedHashMap<>();
|
|
|
+ defaults.put("F14", levelMap(2, 4, 10));
|
|
|
+ defaults.put("F15", levelMap(2, 4, 10));
|
|
|
+ defaults.put("F16", levelMap(5, 10, 25));
|
|
|
+ defaults.put("F05", levelMap(1, 2, 5));
|
|
|
+ defaults.put("F07", levelMap(1, 2, 5));
|
|
|
+ defaults.put("F08", levelMap(1, 2, 5));
|
|
|
+
|
|
|
+ ObjectMapper mapper = new ObjectMapper();
|
|
|
+ int updated = 0;
|
|
|
+ for (Map.Entry<String, Map<String, Integer>> entry : defaults.entrySet()) {
|
|
|
+ String code = entry.getKey();
|
|
|
+ Map<String, Integer> levels = entry.getValue();
|
|
|
+ try {
|
|
|
+ List<Map<String, Object>> rows = jdbcTemplate.queryForList(
|
|
|
+ "SELECT id, params_json FROM cf_earn_rule WHERE code = ?", code);
|
|
|
+ for (Map<String, Object> row : rows) {
|
|
|
+ Object id = row.get("id");
|
|
|
+ Object raw = row.get("params_json");
|
|
|
+ String paramsJson = raw == null ? null : String.valueOf(raw);
|
|
|
+ String merged = mergeLevels(mapper, paramsJson, levels);
|
|
|
+ if (merged == null) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ if (!merged.equals(paramsJson == null ? "" : paramsJson)) {
|
|
|
+ jdbcTemplate.update(
|
|
|
+ "UPDATE cf_earn_rule SET params_json = ?, updated_at = NOW() WHERE id = ?",
|
|
|
+ merged, id);
|
|
|
+ updated++;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("迁移437: 规则 {} levels 默认值迁移失败: {}", code, e.getMessage());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (updated > 0) {
|
|
|
+ log.info("迁移437: cf_earn_rule 补 levels 等级金额默认值,更新 {} 行", updated);
|
|
|
+ } else {
|
|
|
+ log.info("迁移437: cf_earn_rule 已含 levels 默认值或无需更新");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /** NONE / FAMILY / PREMIUM 三档等级矩阵 */
|
|
|
+ private static Map<String, Integer> levelMap(int none, int family, int premium) {
|
|
|
+ Map<String, Integer> m = new LinkedHashMap<>();
|
|
|
+ m.put("NONE", none);
|
|
|
+ m.put("FAMILY", family);
|
|
|
+ m.put("PREMIUM", premium);
|
|
|
+ return m;
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 幂等合并 levels 到 params_json:仅当 {@code levels} 缺失对应键时补默认值,保留其它键。
|
|
|
+ * params_json 为空/null 时新建对象再补;无法解析或非 JSON 对象(避免覆盖丢失原内容)
|
|
|
+ * 返回 null,调用方跳过该行,不产生写入(幂等)。
|
|
|
+ *
|
|
|
+ * @return 合并后的 JSON 字符串;合并失败返回 null,调用方跳过该行
|
|
|
+ */
|
|
|
+ private String mergeLevels(ObjectMapper mapper, String paramsJson, Map<String, Integer> levels) {
|
|
|
+ try {
|
|
|
+ JsonNode root;
|
|
|
+ if (paramsJson == null || paramsJson.trim().isEmpty()) {
|
|
|
+ root = mapper.createObjectNode();
|
|
|
+ } else {
|
|
|
+ JsonNode parsed = mapper.readTree(paramsJson);
|
|
|
+ if (parsed == null || !parsed.isObject()) {
|
|
|
+ log.warn("迁移437: params_json 非 JSON 对象,跳过不覆盖: {}", paramsJson);
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ root = parsed;
|
|
|
+ }
|
|
|
+ JsonNode levelsNode = root.get("levels");
|
|
|
+ ObjectNode levelsObj;
|
|
|
+ if (levelsNode != null && levelsNode.isObject()) {
|
|
|
+ levelsObj = (ObjectNode) levelsNode;
|
|
|
+ } else {
|
|
|
+ levelsObj = mapper.createObjectNode();
|
|
|
+ ((ObjectNode) root).set("levels", levelsObj);
|
|
|
+ }
|
|
|
+ for (Map.Entry<String, Integer> lv : levels.entrySet()) {
|
|
|
+ if (!levelsObj.has(lv.getKey())) {
|
|
|
+ levelsObj.put(lv.getKey(), lv.getValue());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return mapper.writeValueAsString(root);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.warn("迁移437: levels 合并失败 params_json={}: {}", paramsJson, e.getMessage());
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void migrateHealthDimensionsTable() {
|
|
|
try {
|
|
|
if (tableExists("health_dimension_score")) {
|
|
|
@@ -13601,9 +13716,9 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
|
|
|
"赠品规则管理端配置"},
|
|
|
{"F05", "活动签到CF", "consume", "per_item", "",
|
|
|
"",
|
|
|
- "{\"source\":\"activities.platform_points\"}",
|
|
|
+ "{\"source\":\"activities.platform_points\",\"levels\":{\"NONE\":1,\"FAMILY\":2,\"PREMIUM\":5}}",
|
|
|
"", "", "", "activity_checkin", "50",
|
|
|
- "活动配置数量"},
|
|
|
+ "活动配置数量;等级金额通道:非会员1/家庭2/超级5"},
|
|
|
{"F06", "菌群健康调研打卡返还", "consume", "formula", "",
|
|
|
"floor(amt)",
|
|
|
"{\"cf_per_yuan\":100,\"amt_unit\":\"cent\",\"fallback\":\"gut_health_project.cf_refund_amount\",\"example\":\"19.9元=1990CF\"}",
|
|
|
@@ -13611,14 +13726,14 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
|
|
|
"cf_refund_amount 为空时按项目价×100(19.9元=1990CF,§九修正值);一周项目只发一次"},
|
|
|
{"F07", "文章答题奖励", "behavior", "formula", "",
|
|
|
"score + (all_correct ? 3 : 0)",
|
|
|
- "{\"bonus_all_correct\":3,\"dedup\":\"article\"}",
|
|
|
+ "{\"bonus_all_correct\":3,\"dedup\":\"article\",\"levels\":{\"NONE\":1,\"FAMILY\":2,\"PREMIUM\":5}}",
|
|
|
"5", "", "", "article_answer", "70",
|
|
|
- "答对题数+全对3;日限5次(N9)"},
|
|
|
+ "答对题数+全对3;日限5次(N9);等级金额通道:非会员1/家庭2/超级5"},
|
|
|
{"F08", "AI阅读答题奖励", "behavior", "fixed", "5",
|
|
|
"",
|
|
|
- "{\"require_all_correct\":true}",
|
|
|
+ "{\"require_all_correct\":true,\"levels\":{\"NONE\":1,\"FAMILY\":2,\"PREMIUM\":5}}",
|
|
|
"3", "", "", "ai_reading_answer", "80",
|
|
|
- "仅全部答对才发(原硬编码已外置)"},
|
|
|
+ "仅全部答对才发(原硬编码已外置);等级金额通道:非会员1/家庭2/超级5"},
|
|
|
{"F09", "完成测评建档", "behavior", "formula", "",
|
|
|
"first_report ? 50 : 10",
|
|
|
"{\"first_amount\":50,\"repeat_amount\":10,\"dedup_key\":\"report_hash\"}",
|
|
|
@@ -13646,19 +13761,19 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
|
|
|
"默认5CF;日限5次"},
|
|
|
{"F14", "喝水打卡", "behavior", "fixed", "5",
|
|
|
"",
|
|
|
- "{\"daily_limit_by_tier\":\"cf_earn_daily_limit\"}",
|
|
|
+ "{\"daily_limit_by_tier\":\"cf_earn_daily_limit\",\"levels\":{\"NONE\":2,\"FAMILY\":4,\"PREMIUM\":10}}",
|
|
|
"", "", "", "health_water", "140",
|
|
|
- "5CF/次;日限按会员等级(N11)"},
|
|
|
+ "5CF/次;日限按会员等级(N11);等级金额通道:非会员2/家庭4/超级10"},
|
|
|
{"F15", "饮食打卡", "behavior", "fixed", "5",
|
|
|
"",
|
|
|
- "{\"daily_limit_by_tier\":\"cf_earn_daily_limit\"}",
|
|
|
+ "{\"daily_limit_by_tier\":\"cf_earn_daily_limit\",\"levels\":{\"NONE\":2,\"FAMILY\":4,\"PREMIUM\":10}}",
|
|
|
"", "", "", "health_meal", "150",
|
|
|
- "5CF/次;日限按会员等级(N11)"},
|
|
|
+ "5CF/次;日限按会员等级(N11);等级金额通道:非会员2/家庭4/超级10"},
|
|
|
{"F16", "每日健康打卡", "behavior", "fixed", "10",
|
|
|
"",
|
|
|
- "{\"daily_limit_by_tier\":\"cf_earn_daily_limit\"}",
|
|
|
+ "{\"daily_limit_by_tier\":\"cf_earn_daily_limit\",\"levels\":{\"NONE\":5,\"FAMILY\":10,\"PREMIUM\":25}}",
|
|
|
"", "", "", "daily_health_checkin", "160",
|
|
|
- "10CF/次;日限按会员等级(N11)"},
|
|
|
+ "10CF/次;日限按会员等级(N11);等级金额通道:非会员5/家庭10/超级25(F16基准5)"},
|
|
|
{"F17", "挑战赛子任务完成", "behavior", "per_item", "",
|
|
|
"",
|
|
|
"{\"source\":\"challenge_task.reward_cf\"}",
|