From 5814550ca780067f20d6494b5fe8baf729a67dd9 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期日, 07 五月 2023 16:47:14 +0800 Subject: [PATCH] DEMO初步完成 --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java index d689ce0..fe33958 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java @@ -8,13 +8,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.exception.ServiceException; +import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.core.utils.uuid.IdUtils; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.member.domain.dto.AppUserAuthorizeDto; import com.ruoyi.member.domain.dto.MerCashMemberPageDto; import com.ruoyi.member.domain.dto.MerMemberPageDto; +import com.ruoyi.member.domain.pojo.member.MemberNurse; import com.ruoyi.member.domain.vo.*; import com.ruoyi.member.mapper.member.MemberMapper; +import com.ruoyi.member.service.member.MemberNurseService; import com.ruoyi.member.service.member.MemberService; import com.ruoyi.member.util.HttpUtils; import com.ruoyi.system.api.RemoteOrderService; @@ -45,6 +48,7 @@ import javax.annotation.Resource; import java.util.*; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** * <p> @@ -82,6 +86,9 @@ @Resource private RemoteOrderService orderService; + + @Resource + private MemberNurseService memberNurseService; /** * @description: TODO @@ -375,4 +382,20 @@ member.setRelationShopId(appMemberBindingDto.getShopId()); this.saveOrUpdate(member); } + + /** + * + * @param userId + * @return + */ + @Override + public MerMemberBasicFileVo getMerMemberBasicFile(Long userId){ + MerMemberBasicFileVo merMemberBasicFileVo = new MerMemberBasicFileVo(); + Member member = this.getByUserId(userId); + BeanUtils.copyProperties(member, merMemberBasicFileVo); + List<MemberNurse> memberNurseList = memberNurseService.listByUserId(userId); + List<String> valueList = memberNurseList.stream().map(k->k.getNurse()).collect(Collectors.toList()); + merMemberBasicFileVo.setMemberNurse(valueList); + return merMemberBasicFileVo; + } } -- Gitblit v1.7.1