Explorar o código

fix(backend): resolve compilation errors - Java 8 var removal + type casts

Ultraworked with Sisyphus

Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai>
iwt hai 3 meses
pai
achega
b40a2d4c9f

+ 7 - 5
cfc-backend/src/main/java/com/etotem/cfc/controller/PromotionController.java

@@ -1,9 +1,11 @@
 package com.etotem.cfc.controller;
 package com.etotem.cfc.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.common.Result;
+import com.etotem.cfc.entity.FamilyCommission;
+import com.etotem.cfc.entity.PromotionBinding;
 import com.etotem.cfc.service.FamilyCommissionService;
 import com.etotem.cfc.service.FamilyCommissionService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -16,14 +18,14 @@ public class PromotionController {
     private FamilyCommissionService familyCommissionService;
     private FamilyCommissionService familyCommissionService;
 
 
     @PostMapping("/bind")
     @PostMapping("/bind")
-    public Result<Map<String, Object>> bind(@RequestBody Map<String, Object> params) {
+    public Result<PromotionBinding> bind(@RequestBody Map<String, Object> params) {
         String inviteCode = params.get("inviteCode") != null ? params.get("inviteCode").toString() : null;
         String inviteCode = params.get("inviteCode") != null ? params.get("inviteCode").toString() : null;
         Long promoterFamilyId = params.get("promoterFamilyId") != null
         Long promoterFamilyId = params.get("promoterFamilyId") != null
                 ? Long.valueOf(params.get("promoterFamilyId").toString()) : null;
                 ? Long.valueOf(params.get("promoterFamilyId").toString()) : null;
         if (inviteCode == null || promoterFamilyId == null) {
         if (inviteCode == null || promoterFamilyId == null) {
             return Result.error("邀请码和推广方家庭ID不能为空");
             return Result.error("邀请码和推广方家庭ID不能为空");
         }
         }
-        var binding = familyCommissionService.bindByInviteCode(promoterFamilyId, inviteCode);
+        PromotionBinding binding = familyCommissionService.bindByInviteCode(promoterFamilyId, inviteCode);
         if (binding == null) {
         if (binding == null) {
             return Result.error("绑定失败,请检查邀请码");
             return Result.error("绑定失败,请检查邀请码");
         }
         }
@@ -39,7 +41,7 @@ public class PromotionController {
         if (familyId == null) {
         if (familyId == null) {
             return Result.error("家庭ID不能为空");
             return Result.error("家庭ID不能为空");
         }
         }
-        var pageResult = familyCommissionService.getCommissionList(familyId, page, size);
+        Page<FamilyCommission> pageResult = familyCommissionService.getCommissionList(familyId, page, size);
         Map<String, Object> result = new java.util.HashMap<>();
         Map<String, Object> result = new java.util.HashMap<>();
         result.put("records", pageResult.getRecords());
         result.put("records", pageResult.getRecords());
         result.put("total", pageResult.getTotal());
         result.put("total", pageResult.getTotal());
@@ -58,4 +60,4 @@ public class PromotionController {
         List bindings = familyCommissionService.getBindings(familyId);
         List bindings = familyCommissionService.getBindings(familyId);
         return Result.success(bindings);
         return Result.success(bindings);
     }
     }
-}
+}

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

@@ -186,14 +186,14 @@ public class HealthCircleService {
         LambdaQueryWrapper<HealthCircleMember> mw = new LambdaQueryWrapper<HealthCircleMember>()
         LambdaQueryWrapper<HealthCircleMember> mw = new LambdaQueryWrapper<HealthCircleMember>()
                 .eq(HealthCircleMember::getFamilyId, familyId)
                 .eq(HealthCircleMember::getFamilyId, familyId)
                 .eq(HealthCircleMember::getStatus, "active");
                 .eq(HealthCircleMember::getStatus, "active");
-        return (int) healthCircleMemberMapper.selectCount(mw);
+        return (int) (long) healthCircleMemberMapper.selectCount(mw);
     }
     }
 
 
     private int countCircleMembers(Long circleId) {
     private int countCircleMembers(Long circleId) {
         LambdaQueryWrapper<HealthCircleMember> mw = new LambdaQueryWrapper<HealthCircleMember>()
         LambdaQueryWrapper<HealthCircleMember> mw = new LambdaQueryWrapper<HealthCircleMember>()
                 .eq(HealthCircleMember::getCircleId, circleId)
                 .eq(HealthCircleMember::getCircleId, circleId)
                 .eq(HealthCircleMember::getStatus, "active");
                 .eq(HealthCircleMember::getStatus, "active");
-        return (int) healthCircleMemberMapper.selectCount(mw);
+        return (int) (long) healthCircleMemberMapper.selectCount(mw);
     }
     }
 
 
     private String generateInviteCode() {
     private String generateInviteCode() {

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/HealthScoreService.java

@@ -79,7 +79,7 @@ public class HealthScoreService {
 
 
         // 饮食: 每次+2 (上限每日1次)
         // 饮食: 每次+2 (上限每日1次)
         long mealCount = healthMealRecordMapper.selectCount(
         long mealCount = healthMealRecordMapper.selectCount(
-            new LambdaQueryWrapper<HealthMealRecord>().eq(HealthMealRecord::getChildId, childId));
+            new LambdaQueryWrapper<HealthMealRecord>().eq(HealthMealRecord::getMemberId, childId));
         long mealDays = countDistinctDays(childId, "meal");
         long mealDays = countDistinctDays(childId, "meal");
         total += (int) Math.min(mealCount, mealDays * 1) * 2;
         total += (int) Math.min(mealCount, mealDays * 1) * 2;