Просмотр исходного кода

Merge remote-tracking branch 'origin/cfclub' into cfclub

liaoxg 6 дней назад
Родитель
Сommit
cf75a3a76e

+ 0 - 4
cfc-backend/src/main/java/com/etotem/cfc/controller/ai/AIChatController.java

@@ -228,10 +228,6 @@ public class AIChatController {
                 && (draftIdStr == null || draftIdStr.trim().isEmpty())) {
             return Result.error("报告ID或草稿ID不能为空");
         }
-        Long reportId = null;
-        if (reportIdStr != null && !reportIdStr.trim().isEmpty()) {
-            reportId = Long.valueOf(reportIdStr);
-        }
 
         // 1. 会员级别检查
         com.etotem.cfc.entity.User user = userService.getUserInfo(userId);

+ 7 - 2
cfc-frontend/pages/health/gut-flora-detail.vue

@@ -441,7 +441,8 @@ export default {
         messages: [],
         inputText: '',
         conversationId: '',
-        usedToday: false
+        usedToday: false,
+        checkingMembership: false
       }
     }
   },
@@ -542,12 +543,16 @@ riskGroupAbnormalCount: function() {
     openQuickAnalyze: function() {
       this.quickAnalyze.show = true
       var self = this
+      if (self.quickAnalyze.checkingMembership) return
+      self.quickAnalyze.checkingMembership = true
       getMyMembership().then(function(res) {
         var level = res.data && res.data.memberLevel
         if (level && level !== 'FREE') {
           self.quickAnalyze.usedToday = false
         }
-      }).catch(function() {})
+      }).catch(function() {}).finally(function() {
+        self.quickAnalyze.checkingMembership = false
+      })
     },
     closeQuickAnalyze: function() {
       this.quickAnalyze.show = false

+ 7 - 2
cfc-frontend/pages/health/report-confirm.vue

@@ -417,7 +417,8 @@ export default {
         messages: [],
         inputText: '',
         conversationId: '',
-        usedToday: false
+        usedToday: false,
+        checkingMembership: false
       },
       matchedMemberId: null,
       needBind: false,
@@ -629,12 +630,16 @@ export default {
     openQuickAnalyze: function() {
       this.quickAnalyze.show = true
       var self = this
+      if (self.quickAnalyze.checkingMembership) return
+      self.quickAnalyze.checkingMembership = true
       getMyMembership().then(function(res) {
         var level = res.data && res.data.memberLevel
         if (level && level !== 'FREE') {
           self.quickAnalyze.usedToday = false
         }
-      }).catch(function() {})
+      }).catch(function() {}).finally(function() {
+        self.quickAnalyze.checkingMembership = false
+      })
     },
     closeQuickAnalyze: function() {
       this.quickAnalyze.show = false