Forráskód Böngészése

merge: sync origin/cfclub 漂移后推 T01 数据层底座

Agnes Agent 3 napja
szülő
commit
45889c66df

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/service/ButlerResourceMatchService.java

@@ -43,7 +43,7 @@ public class ButlerResourceMatchService {
     @Resource
     private ButlerResourceMatchLogMapper matchLogMapper;
     @Resource
-    private ButlerResourceFollowUpMapper followUpMapper;
+    private ButlerResourceFollowUpMapper butlerResourceFollowUpMapper;
     @Resource
     private ActivityRegistrationService activityRegistrationService;
 
@@ -150,7 +150,7 @@ public class ButlerResourceMatchService {
         followUp.setFollowUpAt(new Date());
         followUp.setCreatedAt(new Date());
         followUp.setUpdatedAt(new Date());
-        followUpMapper.insert(followUp);
+        butlerResourceFollowUpMapper.insert(followUp);
         return Result.success("回访记录已沉淀");
     }
 

+ 3 - 3
cfc-backend/src/main/java/com/etotem/cfc/service/HealthDataSourceBridgeService.java

@@ -47,7 +47,7 @@ public class HealthDataSourceBridgeService {
             "growth", "sleep", "vision", "immunity", "nutrition", "gut", "exercise"));
 
     @Resource
-    private HealthDimensionScoreService dimensionScoreService;
+    private HealthDimensionScoreService healthDimensionScoreService;
 
     /**
      * 契约入口:批量桥接(触发点 A 同批写入,§3.2/§6 ③)。同批记录按序写入,
@@ -149,7 +149,7 @@ public class HealthDataSourceBridgeService {
                                        Integer score, Integer percentile, Date assessDate) {
         HealthDimensionScore existing = null;
         try {
-            existing = dimensionScoreService.getLatestScore(record.getMemberId(), dimension);
+            existing = healthDimensionScoreService.getLatestScore(record.getMemberId(), dimension);
         } catch (Exception e) {
             log.warn("health.dataSource.bridgeWrite 读取既有最新分失败,跳过维度 {}: {}", dimension, e.getMessage());
             return;
@@ -169,6 +169,6 @@ public class HealthDataSourceBridgeService {
         target.setTier(Integer.valueOf(TIER_DEVICE));
         target.setRawData(record.getParsedResult());
         target.setAssessDate(assessDate);
-        dimensionScoreService.saveScore(target);
+        healthDimensionScoreService.saveScore(target);
     }
 }