diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java index e43098473..091291fee 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/PileAuthCardDTO.java @@ -2,6 +2,8 @@ package com.jsowell.pile.dto; import lombok.Data; +import java.util.List; + /** * 鉴权卡dto * @@ -27,4 +29,6 @@ public class PileAuthCardDTO { private String verificationCode; private String merchantId; + + private List merchantIdList; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index f95fa0ec3..6136df0fb 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -10,6 +10,9 @@ import com.jsowell.pile.dto.PileAuthCardDTO; import com.jsowell.pile.mapper.PileAuthCardMapper; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IPileAuthCardService; +import com.jsowell.pile.util.UserUtils; +import com.jsowell.pile.vo.base.LoginUserDetailVO; +import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.uniapp.AuthCardVO; import com.jsowell.pile.vo.web.PileAuthCardVO; import org.apache.commons.lang3.RandomStringUtils; @@ -19,6 +22,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.List; import java.util.Locale; +import java.util.stream.Collectors; /** * 充电站鉴权卡Service业务层处理 @@ -79,6 +83,10 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService { */ @Override public List getPileAuthCardInfoList(PileAuthCardDTO dto) { + LoginUserDetailVO loginUserDetail = UserUtils.getLoginUserDetail(); + List merchantInfoVOList = loginUserDetail.getMerchantInfoVOList(); + List merchantIdList = merchantInfoVOList.stream().map(MerchantInfoVO::getMerchantId).collect(Collectors.toList()); + dto.setMerchantIdList(merchantIdList); return pileAuthCardMapper.getPileAuthCardInfoList(dto); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml index cd5370361..fe72fc64e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml @@ -178,6 +178,12 @@ and t1.status = #{status} and t2.mobile_number = #{phoneNumber} and t1.member_id = #{memberId} + + and t1.merchant_id in + + #{merchantId,jdbcType=VARCHAR} + +