From fcddbd6377d7d8e8a90dfe4de00bf6601925a909 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 7 Nov 2023 16:44:06 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=80=E5=B1=9E=E4=B8=80=E7=BA=A7=E8=BF=90?= =?UTF-8?q?=E8=90=A5=E5=95=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MemberBasicInfoServiceImpl.java | 17 +++++++++++++---- .../impl/PileMerchantInfoServiceImpl.java | 3 +++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 8bd2f843a..7d3487cfc 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -9,10 +9,7 @@ import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.SecurityUtils; import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.domain.MemberBasicInfo; -import com.jsowell.pile.domain.MemberPlateNumberRelation; -import com.jsowell.pile.domain.MemberWalletInfo; -import com.jsowell.pile.domain.MemberWalletLog; +import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.PlatformTesterDTO; import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; @@ -22,6 +19,7 @@ import com.jsowell.pile.mapper.MemberWalletInfoMapper; import com.jsowell.pile.mapper.MemberWalletLogMapper; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.uniapp.MemberBalanceVO; import com.jsowell.pile.vo.uniapp.MemberVO; @@ -64,6 +62,10 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { @Autowired private RedisCache redisCache; + + @Autowired + private IPileMerchantInfoService pileMerchantInfoService; + /** * 查询会员基础信息 * @@ -315,6 +317,13 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { if (CollectionUtils.isNotEmpty(merchantDeptIds)) { dto.setMerchantDeptIds(merchantDeptIds); } + + PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(authorizedMap.getDeptId()); + if (pileMerchantInfo != null) { + String id = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(pileMerchantInfo.getId() + ""); + dto.setMerchantId(id); + } + return memberBasicInfoMapper.selectMemberList(dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 08bd38786..5a737b760 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -328,6 +328,9 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { @Override public PileMerchantInfo queryInfoByDeptId(String deptId) { + if (StringUtils.isBlank(deptId)) { + return null; + } return pileMerchantInfoMapper.queryInfoByDeptId(deptId); }