Selaa lähdekoodia

fix(backend): 修复 cfclub 主干编译错误(d8687f7c8 childId→memberId 重构遗留)

- TongueRecord: 删除重复 memberId 字段与重复 getMemberId/setMemberId
- DatabaseInitializer: 移除 lombok.var 误 import,var ds= 改为 javax.sql.DataSource ds=
- CouponController.exchange: 修复 memberId 变量重复定义

基线 origin/cfclub(9509327f) 无法编译,此 3 处为全部编译错误根因,
修复后 mvn -DskipTests compile 通过(前置即 gate 要求)。
Sisyphus 2 viikkoa sitten
vanhempi
sitoutus
3d27456f2f

+ 2 - 3
cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -9,7 +9,6 @@ import javax.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import lombok.var;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.io.ClassPathResource;
@@ -10151,7 +10150,7 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
         // ===== 迁移:初始化方案规则数据 (P1) =====
         try {
             // 使用 jdbcTemplate 的 DataSource
-            var ds = jdbcTemplate.getDataSource();
+            javax.sql.DataSource ds = jdbcTemplate.getDataSource();
             if (ds instanceof javax.sql.DataSource) {
                 try (Connection conn = ((javax.sql.DataSource) ds).getConnection()) {
                     PreparedStatement ps = null;
@@ -10191,7 +10190,7 @@ sqls.add("INSERT IGNORE INTO health_norm_reference (dimension, gender, age_min,
         // ===== 迁移:初始化报告类型注册 (R1) =====
         try {
             // 使用 jdbcTemplate 的 DataSource
-            var ds = jdbcTemplate.getDataSource();
+            javax.sql.DataSource ds = jdbcTemplate.getDataSource();
             if (ds instanceof javax.sql.DataSource) {
                 try (Connection conn = ((javax.sql.DataSource) ds).getConnection()) {
                     PreparedStatement ps = null;

+ 2 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/CouponController.java

@@ -56,8 +56,8 @@ public class CouponController {
     public Result<Map<String, Object>> exchange(@RequestAttribute("userId") Long userId,
                                                 @RequestBody Map<String, Object> params) {
         Long couponId = ParamUtils.getLong(params.get("couponId"));
-        Object memberId = params.get("memberId");
-        Long memberId = memberId != null ? Long.valueOf(memberId.toString()) : null;
+        Long memberId = params.get("memberId") != null
+                ? Long.valueOf(params.get("memberId").toString()) : null;
         PointsExchangeRecord record = pointsExchangeService.exchangeCoupon(userId, memberId, couponId);
         return Result.success(java.util.Collections.singletonMap("recordId", record.getId()));
     }

+ 0 - 4
cfc-backend/src/main/java/com/etotem/cfc/entity/TongueRecord.java

@@ -11,8 +11,6 @@ import java.util.Date;
 public class TongueRecord {
     @TableId(type = IdType.AUTO)
     private Long id;
-    @JsonProperty("childId")
-    private Long memberId;
     @TableField("child_id")
     @JsonProperty("childId")
     private Long memberId;
@@ -26,8 +24,6 @@ public class TongueRecord {
     public void setId(Long id) { this.id = id; }
     public Long getMemberId() { return memberId; }
     public void setMemberId(Long memberId) { this.memberId = memberId; }
-    public Long getMemberId() { return memberId; }
-    public void setMemberId(Long memberId) { this.memberId = memberId; }
     public String getImageUrl() { return imageUrl; }
     public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; }
     public String getOverallAssessment() { return overallAssessment; }