From c8e8cb5df859b79647b9a1dbb9c2edd50dc6375a Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2023 17:44:10 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=BD=A6=E7=89=8C=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0vin=5Fcode,=20vin=5Fstatus=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/MemberController.java | 2 +- .../com/jsowell/service/MemberService.java | 2 +- .../domain/MemberPlateNumberRelation.java | 10 ++++++++ .../MemberPlateNumberRelationMapper.java | 2 +- .../IMemberPlateNumberRelationService.java | 2 +- .../impl/MemberBasicInfoServiceImpl.java | 4 ++-- .../MemberPlateNumberRelationServiceImpl.java | 2 +- .../pile/MemberPlateNumberRelationMapper.xml | 24 +++++++++---------- 8 files changed, 29 insertions(+), 19 deletions(-) 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 6f4541f02..396bcd9b1 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 @@ -228,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 c5c84b474..d0464e1f5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -313,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/domain/MemberPlateNumberRelation.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java index b0ba6494d..93a397c68 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberPlateNumberRelation.java @@ -41,6 +41,16 @@ public class MemberPlateNumberRelation { @Excel(name = "车牌号") private String licensePlateNumber; + /** + * 车架号 + */ + private String vinCode; + + /** + * vin状态 + */ + private String vinStatus; + /** * 创建时间 */ 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 3d24b953c..fa8202613 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 @@ -29,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 ddb7debdd..08a76e88a 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 @@ -27,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 633fd7e5f..8c0a51691 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 @@ -250,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(MemberPlateNumberVO::getLicensePlateNumber) + .map(MemberPlateNumberRelation::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 83c5048da..84285465a 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 @@ -40,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 6f8cd410d..8b7ba5ad8 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml @@ -9,30 +9,24 @@ + + - select id, member_id, phone_number, license_plate_number, create_time from member_plate_number_relation where del_flag = '0' + select id, member_id, phone_number, license_plate_number, vin_code, vin_status, create_time from member_plate_number_relation where del_flag = '0' - id, member_id, phone_number, license_plate_number, create_time, del_flag + id, member_id, phone_number, license_plate_number, vin_code, vin_status, create_time, del_flag - select - t1.id, - t1.member_id as memberId, - t1.phone_number as phoneNumber, - t1.license_plate_number as licensePlateNumber, - t1.create_time as createTime, - t1.del_flag as delFlag, - t2.vin_code as vinCode - from member_plate_number_relation t1 - join car_vin_info t2 on t1.member_id = t2.member_id + where del_flag = '0' and member_id = #{memberId} and phone_number = #{phoneNumber} @@ -50,11 +44,15 @@ member_id, phone_number, license_plate_number, + vin_code, + vin_status, #{memberId}, #{phoneNumber}, #{licensePlateNumber}, + #{vinCode}, + #{vinStatus}, @@ -64,6 +62,8 @@ member_id = #{memberId}, phone_number = #{phoneNumber}, license_plate_number = #{licensePlateNumber}, + vin_code = #{vinCode}, + vin_status = #{vinStatus}, where id = #{id}