|
|
@@ -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;
|
|
|
+ }
|
|
|
}
|