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

chore: auto bump version and changelog [skip ci]

iwt 1 неделя назад
Родитель
Сommit
b9bdcb9a43

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

@@ -57,9 +57,14 @@ public class FoodRecommendController {
     @Operation(summary = "获取戒备食材列表(推荐指数 < 0)")
     @PostMapping("/caution")
     public Result<List<FoodRecommendIndex>> getCautionFoods(
-            @RequestAttribute("userId") Long userId) {
+            @RequestAttribute("userId") Long userId,
+            @RequestBody(required = false) Map<String, Object> params) {
         if (userId == null) return Result.error("请先登录");
-        List<FoodRecommendIndex> foods = foodRecommendService.getCautionFoods(userId);
+        Long memberId = null;
+        if (params != null && params.get("memberId") instanceof Number) {
+            memberId = ((Number) params.get("memberId")).longValue();
+        }
+        List<FoodRecommendIndex> foods = foodRecommendService.getCautionFoods(memberId != null ? memberId : userId);
         return Result.success(foods);
     }
 }

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

@@ -253,13 +253,37 @@ public class FoodRecommendService {
     }
     /**
      * 获取戒备食材列表(推荐指数 < 0),按指数升序排列(最需戒备的排最前)
+     * @param queryUserId 查询目标,传memberId则按成员查,否则退回userId
      */
-    public List<FoodRecommendIndex> getCautionFoods(Long userId) {
+    public List<FoodRecommendIndex> getCautionFoods(Long queryUserId) {
         return foodRecommendIndexMapper.selectList(
                 new LambdaQueryWrapper<FoodRecommendIndex>()
-                        .eq(FoodRecommendIndex::getUserId, userId)
+                        .eq(FoodRecommendIndex::getUserId, queryUserId)
                         .lt(FoodRecommendIndex::getIndexScore, 0)
                         .orderByAsc(FoodRecommendIndex::getIndexScore)
         );
     }
+
+    /**
+     * 获取家庭成员列表(含当前切换的成员信息)
+     */
+    public List<Map<String, Object>> getFamilyMembersForCaution(Long familyId) {
+        List<FamilyMember> members = familyMemberMapper.selectList(
+                new LambdaQueryWrapper<FamilyMember>()
+                        .eq(FamilyMember::getFamilyId, familyId)
+                        .eq(FamilyMember::getShowToFamily, 1)
+        );
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (FamilyMember m : members) {
+            Map<String, Object> item = new LinkedHashMap<>();
+            item.put("id", m.getId());
+            item.put("userId", m.getUserId());
+            item.put("nickname", m.getNickname());
+            item.put("avatar", m.getAvatar());
+            item.put("effectiveRole", m.getEffectiveRole());
+            item.put("roleLabel", m.getRoleLabel());
+            result.add(item);
+        }
+        return result;
+    }
 }

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-ac456febee2e1be55718e3517a6bcb0c6e7beb22
+6718fa887e6737ea1a5b64f6b61fcd738df3f580

+ 2 - 2
cfc-web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cfc-web",
-  "version": "1.0.1343",
+  "version": "1.0.1344",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cfc-web",
-      "version": "1.0.1343",
+      "version": "1.0.1344",
       "dependencies": {
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^1.0.2",