Browse Source

chore: auto bump version and changelog [skip ci]

iwt 1 month ago
parent
commit
cbbd80e9d5

+ 3 - 4
cfc-backend/src/main/java/com/etotem/cfc/controller/MembershipController.java

@@ -230,13 +230,12 @@ public class MembershipController {
             plan.put("recommended", "FAMILY".equals(level.getLevelCode()));
             // 付费等级价格从 sys_config 读取
             if ("FAMILY".equals(level.getLevelCode())) {
+                // 家庭会员仅支持年付
                 String yearlyStr = sysConfigService.getValue("member_fee_family_yearly");
                 if (yearlyStr == null) yearlyStr = sysConfigService.getValue("member_fee_family");
-                String monthlyStr = sysConfigService.getValue("member_fee_family_monthly");
-                String quarterlyStr = sysConfigService.getValue("member_fee_family_quarterly");
                 plan.put("yearly", yearlyStr != null ? Integer.parseInt(yearlyStr) : 131400);
-                plan.put("monthly", monthlyStr != null ? Integer.parseInt(monthlyStr) : 13140);
-                plan.put("quarterly", quarterlyStr != null ? Integer.parseInt(quarterlyStr) : 32850);
+                plan.put("monthly", null);
+                plan.put("quarterly", null);
             } else if ("PREMIUM".equals(level.getLevelCode())) {
                 String yearlyStr = sysConfigService.getValue("member_fee_premium");
                 String monthlyStr = sysConfigService.getValue("member_fee_premium_monthly");

+ 5 - 5
cfc-backend/src/main/java/com/etotem/cfc/service/MembershipService.java

@@ -237,13 +237,13 @@ public class MembershipService implements MembershipServiceInterface {
         Integer amount;
         String effectivePeriod = period != null ? period : "yearly";
         if ("FAMILY".equals(levelCode)) {
-            // Family定价按period从sysConfig读取
-            String configKey = "member_fee_family_" + effectivePeriod;
-            String feeStr = sysConfigService.getValue(configKey);
+            // 家庭会员仅支持年付
+            effectivePeriod = "yearly";
+            String feeStr = sysConfigService.getValue("member_fee_family_yearly");
             if (feeStr == null) {
-                feeStr = sysConfigService.getValue("member_fee_family"); // 回退到默认年费
+                feeStr = sysConfigService.getValue("member_fee_family");
             }
-            int fee = feeStr != null ? Integer.parseInt(feeStr) : 36500;
+            int fee = feeStr != null ? Integer.parseInt(feeStr) : 131400;
             amount = fee;
         } else if ("PROVIDER".equals(levelCode)) {
             String configKey = "member_fee_standard_" + effectivePeriod;

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-400eb000840c0160073bb8e192b3daff8b79724e
+ee99947ef8da4ee16b58b2160864896921df3e65

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.616",
+  "version": "1.0.617",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.616",
+      "version": "1.0.617",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",

+ 1 - 1
cfc-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cfc-web",
-  "version": "1.0.617",
+  "version": "1.0.618",
   "private": true,
   "scripts": {
     "dev": "vue-cli-service serve",

+ 6 - 0
cfc-web/public/CHANGELOG-v1.0.md

@@ -4,6 +4,12 @@
 
 ---
 
+## v1.0.618 (2026-07-29)
+
+### 文档
+- 新增财富能量兑换优惠券流程图
+
+
 ## v1.0.617 (2026-07-29)
 
 ### Bug 修复

+ 7 - 1
cfc-web/public/CHANGELOG.md

@@ -1,6 +1,6 @@
 # 更新日志
 
-> 当前版本: v1.0.617
+> 当前版本: v1.0.618
 
 ## 历史版本
 
@@ -8,6 +8,12 @@
 
 ---
 
+## v1.0.618 (2026-07-29)
+
+### 文档
+- 新增财富能量兑换优惠券流程图
+
+
 ## v1.0.617 (2026-07-29)
 
 ### Bug 修复