update 车牌信息表添加vin_code, vin_status字段

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<MemberPlateNumberVO> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
+			List<MemberPlateNumberRelation> resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info);
 			response = new RestApiResponse<>(resultList);
 		} catch (Exception e) {
 			logger.error("通过 memberId 查询用户个人基本信息 error", e);

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<MemberPlateNumberVO> list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation);
+		List<MemberPlateNumberRelation> list = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(relation);
 		if (CollectionUtils.isNotEmpty(list)) {
 			// 不为空说明该用户绑定过此车牌号
 			throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING);

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;
+
     /**
      * 创建时间
      */

jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberPlateNumberRelationMapper.java

@@ -29,7 +29,7 @@ public interface MemberPlateNumberRelationMapper {
      * @param memberPlateNumberRelation 用户车牌对应关系
      * @return 用户车牌对应关系集合
      */
-    public List<MemberPlateNumberVO> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
+    public List<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
 
     /**
      * 新增用户车牌对应关系

jsowell-pile/src/main/java/com/jsowell/pile/service/IMemberPlateNumberRelationService.java

@@ -27,7 +27,7 @@ public interface IMemberPlateNumberRelationService
      * @param memberPlateNumberRelation 用户车牌对应关系
      * @return 用户车牌对应关系集合
      */
-    public List<MemberPlateNumberVO> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
+    public List<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation);
 
     /**
      * 新增用户车牌对应关系

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<MemberPlateNumberVO> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
+		List<MemberPlateNumberRelation> list = memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
 		List<String> plateNumberList = list.stream()
-				.map(MemberPlateNumberVO::getLicensePlateNumber)
+				.map(MemberPlateNumberRelation::getLicensePlateNumber)
 				.collect(Collectors.toList());
 		vo.setPlateNumberList(plateNumberList);
 		return vo;

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<MemberPlateNumberVO> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) {
+    public List<MemberPlateNumberRelation> selectMemberPlateNumberRelationList(MemberPlateNumberRelation memberPlateNumberRelation) {
         return memberPlateNumberRelationMapper.selectMemberPlateNumberRelationList(memberPlateNumberRelation);
     }
 

jsowell-pile/src/main/resources/mapper/pile/MemberPlateNumberRelationMapper.xml

@@ -9,30 +9,24 @@
         <result property="memberId"    column="member_id"    />
         <result property="phoneNumber"    column="phone_number"    />
         <result property="licensePlateNumber"    column="license_plate_number"    />
+        <result property="vinCode"    column="vin_code"    />
+        <result property="vinStatus"    column="vin_status"    />
         <result property="createTime"    column="create_time"    />
         <result property="delFlag"    column="del_flag"    />
     </resultMap>
 
     <sql id="selectMemberLicensePlateNumberRelationVo">
-        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'
     </sql>
 
     <sql id="Base_Column_List">
         <!--@mbg.generated PileBillingTemplate-->
-        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
     </sql>
 
-    <select id="selectMemberPlateNumberRelationList" parameterType="com.jsowell.pile.domain.MemberPlateNumberRelation" resultType="com.jsowell.pile.vo.MemberPlateNumberVO">
+    <select id="selectMemberPlateNumberRelationList" parameterType="com.jsowell.pile.domain.MemberPlateNumberRelation" resultType="com.jsowell.pile.domain.MemberPlateNumberRelation">
         select
-            t1.id,
+        <include refid="Base_Column_List"/>
-            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'
         <if test="memberId != null  and memberId != ''"> and member_id = #{memberId}</if>
         <if test="phoneNumber != null  and phoneNumber != ''"> and phone_number = #{phoneNumber}</if>
@@ -50,11 +44,15 @@
             <if test="memberId != null">member_id,</if>
             <if test="phoneNumber != null">phone_number,</if>
             <if test="licensePlateNumber != null">license_plate_number,</if>
+            <if test="vinCode != null">vin_code,</if>
+            <if test="vinStatus != null">vin_status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="memberId != null">#{memberId},</if>
             <if test="phoneNumber != null">#{phoneNumber},</if>
             <if test="licensePlateNumber != null">#{licensePlateNumber},</if>
+            <if test="vinCode != null">#{vinCode},</if>
+            <if test="vinStatus != null">#{vinStatus},</if>
         </trim>
     </insert>
 
@@ -64,6 +62,8 @@
             <if test="memberId != null">member_id = #{memberId},</if>
             <if test="phoneNumber != null">phone_number = #{phoneNumber},</if>
             <if test="licensePlateNumber != null">license_plate_number = #{licensePlateNumber},</if>
+            <if test="vinCode != null">vin_code = #{vinCode},</if>
+            <if test="vinStatus != null">vin_status = #{vinStatus},</if>
         </trim>
         where id = #{id}
     </update>