fix:去除0资历的成就统计

Author: fifthThirteen

src/components/cj/achievement-count.vue

@@ -9,7 +9,11 @@
     </div>
 </template>
 <script>
-import { getAchievementsTotal } from "@/service/achievement";
+import { getAchievementPointsV2 } from "@/service/achievement";
+import {
+    normalizeCountableAchievementMetadata,
+    summarizeVisibleAchievements,
+} from "@/utils/achievement-statistics";
 
 export default {
     name: "AchievementCount",
@@ -26,10 +30,11 @@ export default {
         };
     },
     created() {
-        // 获取成就统计信息
-        getAchievementsTotal().then((data) => {
-            data = data.data;
-            this.count = data.data.count;
+        // 统一从 v2 点数元数据派生数量，零资历成就不进入统计。
+        getAchievementPointsV2().then((response) => {
+            const metadata = normalizeCountableAchievementMetadata(response.data?.data?.points || {});
+            this.count = summarizeVisibleAchievements(metadata);
+            this.$store.commit("SET_STATE", { key: "achievementMetadata", value: metadata });
             this.$store.commit("SET_STATE", { key: "generalTotal", value: ~~this.count["general"] });
             this.$store.commit("SET_STATE", { key: "armorTotal", value: ~~this.count["armor"] });
         });

src/components/cj/sidebar.vue

@@ -48,18 +48,15 @@
                 <template #default="{ data }">
                     <router-link class="el-tree-node__label" :to="menu_url(data)">
                         <span class="u-name" v-text="data.name"></span>
-                        <em v-if="data.achievements_count" class="u-count">
+                        <em v-if="getMenuAchievementCount(data)" class="u-count">
                             (<span v-if="currentRole">{{
                                 `${
                                     uncompleted
-                                        ? data.achievements_count +
-                                          ~~data.own_achievements_count -
-                                          getMenuCompleted(data)
+                                        ? Math.max(0, getMenuAchievementCount(data) - getMenuCompleted(data))
                                         : getMenuCompleted(data)
                                 }/`
                             }}</span>
-                            <span>{{ `${data.achievements_count + ~~data.own_achievements_count}` }}</span
-                            >)
+                            <span>{{ getMenuAchievementCount(data) }}</span>)
                         </em>
                     </router-link>
                 </template>
@@ -74,7 +71,8 @@ import RoleSelect from "@/components/common/role-select.vue";
 import bus from "@/store/bus";
 import User from "@jx3box/jx3box-common/js/user";
 import { showSchoolIcon } from "@jx3box/jx3box-common/js/utils";
-import { flattenDeep, cloneDeep, omit } from "lodash";
+import { omit } from "lodash";
+import { collectMenuAchievementIds } from "@/utils/achievement-statistics";
 export default {
     name: "Sidebar",
     props: ["sidebar"],
@@ -127,6 +125,9 @@ export default {
         achievementsVirtual() {
             return this.$store.state.achievementsVirtual;
         },
+        achievementMetadata() {
+            return this.$store.state.achievementMetadata;
+        },
         selectedGeneral: {
             get() {
                 return this.sidebar.general;
@@ -152,7 +153,7 @@ export default {
         },
         total({ menus }) {
             const numList = menus.map((data) => {
-                return data.achievements_count + data.own_achievements_count;
+                return this.getMenuAchievementCount(data);
             });
             return numList.reduce((acc, cur) => {
                 return acc + cur;
@@ -224,44 +225,21 @@ export default {
         },
     },
     methods: {
-        getLastAchievement(achievements = []) {
-            // 娓告垙瑙掕壊
-            // 姣斿浼犲姛锛屽彧鍙栨渶鍚庝竴涓紶鍔?00娆＄殑ID浣滀负鏄惁瀹屾垚鐨勪緷鎹?
-            if (!Array.isArray(achievements)) return [];
-            return achievements.map((achievement) => {
-                if (Array.isArray(achievement)) {
-                    // 姣斿浼犲姛锛屽彧鍙栨渶鍚庝竴涓紶鍔?00娆＄殑ID浣滀负鏄惁瀹屾垚鐨勪緷鎹?
-                    const lastOne = achievement?.[achievement.length - 1];
-                    return lastOne;
-                } else {
-                    return achievement;
-                }
+        getMenuAchievementIds(data) {
+            return collectMenuAchievementIds(data).filter((id) => {
+                const item = this.achievementMetadata[id];
+                return item?.visible && item.general === this.sidebar.general;
             });
         },
+        getMenuAchievementCount(data) {
+            return this.getMenuAchievementIds(data).length;
+        },
         getMenuCompleted(data, achievementsVirtual, achievements) {
-            const newData = cloneDeep(data);
-            const newDataAchievements = this.isVirtual
-                ? flattenDeep(newData.achievements)
-                : this.getLastAchievement(newData.achievements);
-            newData.all_achievements = newData.children
-                ? Array.from(
-                      new Set(
-                          newDataAchievements.concat(
-                              flattenDeep(
-                                  newData.children.map((item) => {
-                                      return this.isVirtual
-                                          ? item.achievements
-                                          : this.getLastAchievement(item.achievements);
-                                  })
-                              )
-                          )
-                      )
-                  )
-                : newDataAchievements;
             const list = this.isVirtual
                 ? achievementsVirtual || this.achievementsVirtual
                 : achievements || this.achievements;
-            return newData.all_achievements.filter((item) => list.includes(item + ""))?.length;
+            const completedIds = new Set((list || []).map(String));
+            return this.getMenuAchievementIds(data).filter((id) => completedIds.has(id)).length;
         },
         filterNode(value, data) {
             if (!value) return true;
@@ -338,7 +316,7 @@ export default {
             //     return;
             // }
 
-            getMenus({ general }).then(
+            getMenus({ general, client: this.$store.state.client }).then(
                 (data) => {
                     data = data.data;
                     if (data.code === 200) {

src/service/achievement.js

@@ -61,6 +61,15 @@ export function getAchievementPoints(general) {
     });
 }
 
+// 获取成就点数及常规/五甲、可见/隐藏元数据。
+export function getAchievementPointsV2() {
+    return $.get(`/api/node/v2/achievement/points`, {
+        params: {
+            client,
+        },
+    });
+}
+
 // 获取菜单下成就
 export function getMenuAchievements(sub, detail, params) {
     let url = `/api/cms/helper/achievements/${sub}`;

src/store/cj.js

@@ -13,6 +13,7 @@ const store = {
         achievements: [],
         generalTotal: 0,
         armorTotal: 0,
+        achievementMetadata: {},
         onlyUncompleted: false,
         achievementsVirtual: [],
         viewAchievementsName: null,

src/utils/achievement-statistics.js

@@ -0,0 +1,65 @@
+function appendAchievementIds(value, target) {
+    if (Array.isArray(value)) {
+        value.forEach((item) => appendAchievementIds(item, target));
+        return;
+    }
+
+    if (value === null || value === undefined || value === "") return;
+    target.add(String(value));
+}
+
+function walkMenuNode(node, target) {
+    if (!node || typeof node !== "object") return;
+    appendAchievementIds(node.achievements || [], target);
+    (node.children || []).forEach((child) => walkMenuNode(child, target));
+}
+
+export function collectMenuAchievementIds(menu) {
+    const ids = new Set();
+    const roots = Array.isArray(menu) ? menu : [menu];
+    roots.forEach((root) => walkMenuNode(root, ids));
+    return [...ids];
+}
+
+export function normalizeCountableAchievementMetadata(points) {
+    return Object.entries(points || {}).reduce((metadata, [id, tuple]) => {
+        if (!Array.isArray(tuple) || tuple.length < 3) return metadata;
+
+        const point = Number(tuple[0]);
+        const general = Number(tuple[1]);
+        const visible = Number(tuple[2]);
+        if (!Number.isFinite(point) || point <= 0 || ![0, 1, 2, 3].includes(general) || ![0, 1].includes(visible)) {
+            return metadata;
+        }
+
+        metadata[String(id)] = {
+            point,
+            general,
+            visible: visible === 1,
+        };
+        return metadata;
+    }, {});
+}
+
+export function summarizeVisibleAchievements(metadata) {
+    const count = {
+        general: 0,
+        general_point: 0,
+        armor: 0,
+        armor_point: 0,
+    };
+
+    Object.values(metadata || {}).forEach((item) => {
+        if (!item.visible) return;
+        if (item.general === 1) {
+            count.general += 1;
+            count.general_point += item.point;
+        }
+        if (item.general === 2) {
+            count.armor += 1;
+            count.armor_point += item.point;
+        }
+    });
+
+    return count;
+}