fix：子女端登陆绑定长者逻辑修改

6a8033c9 · huangjy · b7f2368b · 6a8033c9 · 6a8033c9 · 6a8033c9
Commit 6a8033c9 authored Nov 06, 2023 by huangjy
Showing with 47 additions and 4 deletions
server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoChildrenController.java
server-service/src/main/java/com/makeit/service/platform/elder/PlatElderChildrenInfoService.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
server-service/src/main/java/com/makeit/vo/wechat/elder/PlatElderChildrenInfoWechatVO.java
--- a/server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoChildrenController.java
+++ b/server-module/src/main/java/com/makeit/module/controller/children/elder/PlatElderChildrenInfoChildrenController.java
@@ -4,8 +4,12 @@ package com.makeit.module.controller.children.elder;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.elder.PlatElderIdDTO;
+import com.makeit.dto.platform.elder.PlatElderQueryDTO;
 import com.makeit.dto.platform.elder.children.PlatElderChildrenInfoWechatDTOVO;
+import com.makeit.entity.platform.elder.PlatElderChildrenInfo;
+import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.elder.PlatElderChildrenInfoService;
+import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -16,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 /**
 * <p>
 * 长者子女账号 前端控制器
@@ -38,6 +44,15 @@ public class PlatElderChildrenInfoChildrenController {
        return ApiResponseUtils.success(platElderChildrenInfoService.view());
    }
+    @ApiOperation("根据openid选择老人列表")
+    @PostMapping("listByOpenid")
+    @TenantIdIgnore
+    public ApiResponseEntity<List<PlatElderChildrenInfoWechatVO>> listByOpenid(@RequestBody PlatElderChildrenInfo platElderChildrenInfo) {
+        return ApiResponseUtils.success(platElderChildrenInfoService.listByOpenid(platElderChildrenInfo.getOpenid()));
+    }
    @ApiOperation("编辑")
    @PostMapping("edit")
    public ApiResponseEntity<?> edit(@Validated @RequestBody PlatElderChildrenInfoWechatDTOVO dto) {

--- a/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderChildrenInfoService.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/PlatElderChildrenInfoService.java
@@ -39,4 +39,6 @@ public interface PlatElderChildrenInfoService extends IService<PlatElderChildren
    void bind(String elderId);
    void unbind(String elderId);
+    List<PlatElderChildrenInfoWechatVO> listByOpenid(String openid);
 }
--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderChildrenInfoServiceImpl.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
+import com.makeit.common.entity.BaseEntity;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.dto.platform.auth.PlatOrgSplitDTO;
@@ -29,15 +31,13 @@ import com.makeit.utils.user.common.CommonUserVO;
 import com.makeit.utils.user.wechat.WechatUserUtil;
 import com.makeit.vo.platform.elder.PlatElderChildrenInfoListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.function.Function;
 /**
@@ -183,6 +183,29 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
        return BeanDtoVoUtils.convert(getById(WechatUserUtil.getUserId()), PlatElderChildrenInfoWechatVO.class);
    }
+    @Override
+    public List<PlatElderChildrenInfoWechatVO> listByOpenid(String openid) {
+        List<PlatElderChildrenInfo> platElderChildrenInfoList = list(new QueryWrapper<PlatElderChildrenInfo>().lambda().eq(PlatElderChildrenInfo::getOpenid, openid));
+        if (CollectionUtils.isEmpty(platElderChildrenInfoList)) {
+            return Lists.newArrayList();
+        }
+        List<String> elderIdList = StreamUtil.map(platElderChildrenInfoList, PlatElderChildrenInfo::getElderId);
+        Map<String, PlatElder> elderMap = StreamUtil.toMapDep(platElderService.listByIds(elderIdList), BaseEntity::getId);
+        List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList();
+        for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) {
+            PlatElderChildrenInfoWechatVO vo = BeanDtoVoUtils.convert(platElderChildrenInfo, PlatElderChildrenInfoWechatVO.class);
+            PlatElder platElder = elderMap.get(platElderChildrenInfo.getElderId());
+            if (platElder != null) {
+                vo.setElderName(platElder.getName());
+            }
+            voList.add(vo);
+        }
+        return voList;
+    }
    /*子女端小程序*/
    @Override

--- a/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
+++ b/server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java
@@ -52,6 +52,7 @@ import com.makeit.utils.sql.join.JoinUtil;
 import com.makeit.utils.sys.FileUtil;
 import com.makeit.utils.user.plat.PlatUserUtil;
 import com.makeit.utils.user.plat.PlatUserVO;
+import com.makeit.utils.user.wechat.WechatUserUtil;
 import com.makeit.vo.platform.elder.PlatElderExportVO;
 import com.makeit.vo.platform.elder.PlatElderListVO;
 import com.makeit.vo.wechat.elder.PlatElderChildrenInfoWechatVO;

--- a/server-service/src/main/java/com/makeit/vo/wechat/elder/PlatElderChildrenInfoWechatVO.java
+++ b/server-service/src/main/java/com/makeit/vo/wechat/elder/PlatElderChildrenInfoWechatVO.java
@@ -21,6 +21,8 @@ public class PlatElderChildrenInfoWechatVO extends BaseTenantDTO {
    @ApiModelProperty(value = "长者id")
    private String elderId;
+    @ApiModelProperty(value = "长者名称")
+    private String elderName;
    @ApiModelProperty(value = "姓名")
    private String name;