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

fix(compile): 修复 childId→memberId 规范化引入的重复定义

- TongueRecord: 重复 memberId 字段/重复 getter/setter(d8687f7c8 合并失误),
  改为标准 @Data + @TableField("child_id") + @JsonProperty("childId") 单一字段
- CouponController: exchange 方法 memberId 重复声明(Object 与 Long 冲突),
  临时变量改名 memberIdObj
Xiaogang Liao 1 неделя назад
Родитель
Сommit
000e10a892

+ 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;
+        Object memberIdObj = params.get("memberId");
+        Long memberId = memberIdObj != null ? Long.valueOf(memberIdObj.toString()) : null;
         PointsExchangeRecord record = pointsExchangeService.exchangeCoupon(userId, memberId, couponId);
         return Result.success(java.util.Collections.singletonMap("recordId", record.getId()));
     }

+ 7 - 20
cfc-backend/src/main/java/com/etotem/cfc/entity/TongueRecord.java

@@ -5,37 +5,24 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import java.io.Serializable;
 import java.util.Date;
 
+@Data
 @TableName("tongue_records")
-public class TongueRecord {
+public class TongueRecord implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
-    @JsonProperty("childId")
-    private Long memberId;
+
+    /** 家庭成员ID */
     @TableField("child_id")
     @JsonProperty("childId")
     private Long memberId;
+
     private String imageUrl;
     private String overallAssessment;
     private String status;
     private Date createdAt;
     private Date updatedAt;
-
-    public Long getId() { return id; }
-    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; }
-    public void setOverallAssessment(String overallAssessment) { this.overallAssessment = overallAssessment; }
-    public String getStatus() { return status; }
-    public void setStatus(String status) { this.status = status; }
-    public Date getCreatedAt() { return createdAt; }
-    public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; }
-    public Date getUpdatedAt() { return updatedAt; }
-    public void setUpdatedAt(Date updatedAt) { this.updatedAt = updatedAt; }
 }