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 396bcd9b1..07806b34f 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 @@ -240,7 +240,7 @@ public class MemberController extends BaseController { /** - * 用户绑定车牌号 + * 用户绑定车牌号、vin * http://localhost:8080/uniapp/member/memberBindingCarNo * * @return @@ -278,9 +278,13 @@ public class MemberController extends BaseController { try { String memberId = getMemberIdByAuthorization(request); MemberPlateNumberRelation relation = MemberPlateNumberRelation.builder() + .id(Integer.valueOf(dto.getId())) .memberId(memberId) .licensePlateNumber(dto.getCarNo()) .build(); + if (StringUtils.isNotBlank(dto.getVinCode())) { + relation.setVinCode(dto.getVinCode()); + } int i = memberPlateNumberRelationService.updatePlateNumber(relation); response = new RestApiResponse<>(i); } catch (Exception 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 d0464e1f5..789566e9c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -319,6 +319,10 @@ public class MemberService { throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); } relation.setPhoneNumber(dto.getPhoneNumber()); + if (StringUtils.isNotBlank(dto.getVinCode())) { + relation.setVinCode(dto.getVinCode()); + relation.setVinStatus("0"); + } memberPlateNumberRelationService.insertMemberPlateNumberRelation(relation); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java index 42ca3cdca..4eba85bcd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/BindingCarNoDTO.java @@ -12,6 +12,8 @@ import java.util.List; */ @Data public class BindingCarNoDTO { + private String id; + private List ids; private String memberId; @@ -30,4 +32,9 @@ public class BindingCarNoDTO { * 车牌号 */ private String carNo; + + /** + * vin码 + */ + private String vinCode; } 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 fa8202613..f4fe46dd7 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 @@ -81,4 +81,11 @@ public interface MemberPlateNumberRelationMapper { * @return */ int unbindingPlateNumber(@Param("memberId") String memberId, @Param("plateNumber")String plateNumber); + + /** + * 通过vin码查询信息 + * @param vinCode + * @return + */ + MemberPlateNumberRelation getMemberPlateInfoByVinCode(String vinCode); } 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 84285465a..02637e39d 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 @@ -72,7 +72,7 @@ public class MemberPlateNumberRelationServiceImpl implements IMemberPlateNumberR String plateNumber = memberPlateNumberRelation.getLicensePlateNumber().toUpperCase(Locale.ROOT); memberPlateNumberRelation.setLicensePlateNumber(plateNumber); } - return memberPlateNumberRelationMapper.updatePlateNumber(memberPlateNumberRelation); + return memberPlateNumberRelationMapper.updateMemberPlateNumberRelation(memberPlateNumberRelation); } // /** diff --git a/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml index 88e9d1305..08d06c526 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/CarVinInfoMapper.xml @@ -124,7 +124,7 @@ car_vin_info t1 join member_basic_info t2 on t1.member_id = t2.member_id and t1.del_flag = '0' join member_wallet_info t3 on t2.member_id = t3.member_id and t2.status = '1' - where member_id = #{memberId,jdbcType=VARCHAR} + where t1.member_id = #{memberId,jdbcType=VARCHAR} and del_flag = '0' \ No newline at end of file diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml index 8b7ba5ad8..68b8436e5 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml @@ -24,9 +24,11 @@ id, member_id, phone_number, license_plate_number, vin_code, vin_status, create_time, del_flag - select - + + from + member_plate_number_relation where del_flag = '0' and member_id = #{memberId} and phone_number = #{phoneNumber} @@ -97,6 +99,14 @@ update member_plate_number_relation set license_plate_number = #{licensePlateNumber,jdbcType=VARCHAR} - where member_id = #{memberId,jdbcType=VARCHAR} + where id = #{id,jdbcType=INTEGER} + + \ No newline at end of file