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

fix: 修复Java 8编译兼容性问题

- 修复BindGuideDTO缺少guideId和familyId字段
- 修复TaskPlanService和TaskTemplatePackageService中var类型推断(Jave 8不支持)
- 修复TaskTemplatePackageService.getPublicPackages()方法
- 将QueryWrapper.list()改为packageMapper.selectList(wrapper)
User 5 месяцев назад
Родитель
Сommit
27894d0158

+ 4 - 2
zxyj-backend/src/main/java/com/zxyj/dto/BindGuideDTO.java

@@ -6,7 +6,9 @@ import java.math.BigDecimal;
 
 @Data
 public class BindGuideDTO {
-    private String bindToken;    // 绑定令牌
-    private String serviceType;  // monthly/yearly/consulting
+    private String bindToken; // 绑定令牌
+    private String serviceType; // monthly/yearly/consulting
     private BigDecimal servicePrice;
+    private Long guideId; // 指导师ID
+    private Long familyId; // 家庭ID
 }

+ 2 - 1
zxyj-backend/src/main/java/com/zxyj/service/TaskPlanService.java

@@ -3,6 +3,7 @@ package com.zxyj.service;
 import com.zxyj.entity.TaskPlanInstance;
 import com.zxyj.entity.TaskPlanItem;
 import com.zxyj.entity.TaskTemplateItem;
+import com.zxyj.entity.TaskTemplatePackage;
 import com.zxyj.mapper.TaskPlanInstanceMapper;
 import com.zxyj.mapper.TaskPlanItemMapper;
 import com.zxyj.mapper.TaskTemplateItemMapper;
@@ -37,7 +38,7 @@ public class TaskPlanService {
     @Transactional
     public TaskPlanInstance applyPackage(ApplyPackageDTO dto, Long familyId) {
         // 获取套餐信息
-        var pkg = packageService.getPackageById(dto.getPackageId());
+        TaskTemplatePackage pkg = packageService.getPackageById(dto.getPackageId());
         if (pkg == null) {
             throw new RuntimeException("套餐不存在");
         }

+ 7 - 6
zxyj-backend/src/main/java/com/zxyj/service/TaskTemplatePackageService.java

@@ -100,15 +100,16 @@ public class TaskTemplatePackageService {
      * 获取公开套餐列表 (市场)
      */
     public List<TaskTemplatePackage> getPublicPackages(String category) {
-        var wrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<TaskTemplatePackage>()
-            .eq("is_public", 1)
-            .eq("status", "approved");
-        
+        com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<TaskTemplatePackage> wrapper = new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<TaskTemplatePackage>()
+                .eq("is_public", 1)
+                .eq("status", "approved");
+
         if (category != null && !category.isEmpty()) {
             wrapper.eq("category", category);
         }
-        
-        return wrapper.orderByDesc("created_at").list();
+
+        wrapper.orderByDesc("created_at");
+        return packageMapper.selectList(wrapper);
     }
 
     /**