diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 3322b65fc..6f4541f02 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -23,6 +23,7 @@ import com.jsowell.pile.dto.WechatLoginDTO; import com.jsowell.pile.dto.WeixinPayDTO; import com.jsowell.pile.service.IMemberBasicInfoService; import com.jsowell.pile.service.IMemberPlateNumberRelationService; +import com.jsowell.pile.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.service.MemberService; @@ -227,7 +228,7 @@ public class MemberController extends BaseController { try { MemberPlateNumberRelation info = new MemberPlateNumberRelation(); info.setMemberId(memberId); - List resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info); + List resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info); response = new RestApiResponse<>(resultList); } catch (Exception e) { logger.error("通过 memberId 查询用户个人基本信息 error", e); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 63c4f784f..c5c84b474 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -45,6 +45,7 @@ import com.jsowell.pile.service.IPileAuthCardService; import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.transaction.dto.MemberTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; +import com.jsowell.pile.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; @@ -312,7 +313,7 @@ public class MemberService { MemberPlateNumberRelation relation = new MemberPlateNumberRelation(); relation.setMemberId(dto.getMemberId()); relation.setLicensePlateNumber(dto.getCarNo()); - List list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation); + List list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation); if (CollectionUtils.isNotEmpty(list)) { // 不为空说明该用户绑定过此车牌号 throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java index ad60799fe..3d24b953c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java @@ -3,6 +3,7 @@ package com.jsowell.pile.mapper; import java.util.List; import com.jsowell.pile.domain.MemberPlateNumberRelation; +import com.jsowell.pile.vo.MemberPlateNumberVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -28,7 +29,7 @@ public interface MemberPlateNumberRelationMapper { * @param memberPlateNumberRelation 用户车牌对应关系 * @return 用户车牌对应关系集合 */ - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); /** * 新增用户车牌对应关系 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java index 41bc7f653..ddb7debdd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java @@ -2,6 +2,7 @@ package com.jsowell.pile.service; import java.util.List; import com.jsowell.pile.domain.MemberPlateNumberRelation; +import com.jsowell.pile.vo.MemberPlateNumberVO; import org.apache.ibatis.annotations.Param; /** @@ -26,7 +27,7 @@ public interface IMemberPlateNumberRelationService * @param memberPlateNumberRelation 用户车牌对应关系 * @return 用户车牌对应关系集合 */ - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation); /** * 新增用户车牌对应关系 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 a34ded99f..633fd7e5f 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 @@ -13,6 +13,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.vo.MemberPlateNumberVO; import com.jsowell.pile.vo.uniapp.MemberVO; import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; @@ -249,9 +250,9 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { // 查询用户车牌号 MemberPlateNumberRelation memberPlateNumberRelation = new MemberPlateNumberRelation(); memberPlateNumberRelation.setMemberId(memberId); - List list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); + List list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); List plateNumberList = list.stream() - .map(MemberPlateNumberRelation::getLicensePlateNumber) + .map(MemberPlateNumberVO::getLicensePlateNumber) .collect(Collectors.toList()); vo.setPlateNumberList(plateNumberList); return vo; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java index b6899ad45..83c5048da 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Locale; import com.jsowell.common.util.StringUtils; +import com.jsowell.pile.vo.MemberPlateNumberVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; @@ -39,7 +40,7 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR * @return 用户车牌对应关系 */ @Override - public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) { + public List selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) { return memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml index 7d1e0169a..4a336d844 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml @@ -22,7 +22,7 @@ id, member_id, phone_number, license_plate_number, create_time, del_flag - select t1.id, t1.member_id as memberId,