From 0ff8b7dcdd97b623cd55fb0e176d4337f3af4ef2 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Thu, 2 Nov 2023 16:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEvin=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/pile/dto/QueryMemberInfoDTO.java |  2 ++
 .../resources/mapper/pile/MemberBasicInfoMapper.xml   |  4 ++++
 jsowell-ui/src/views/member/info/index.vue            | 11 +++++++++++
 3 files changed, 17 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java
index 66911bbea..35fadc011 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryMemberInfoDTO.java
@@ -25,4 +25,6 @@ public class QueryMemberInfoDTO {
     private String merchantId;
 
     private List<String> merchantDeptIds;
+
+    private String vinCode;
 }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
index dfb582660..f1d7fffcc 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml
@@ -210,6 +210,7 @@
             member_basic_info t1
         JOIN member_wallet_info t2 ON t1.member_id = t2.member_id and t2.del_flag = '0'
         JOIN pile_merchant_info t3 ON t1.merchant_id = t3.id and t3.del_flag = '0'
+        left join member_plate_number_relation t4 on t4.member_id = t1.member_id and t4.del_flag = '0'
         where
             t1.del_flag = '0'
         <if test="dto.mobileNumber != null and dto.mobileNumber != ''">and t1.mobile_number like '%${dto.mobileNumber}%'</if>
@@ -222,6 +223,9 @@
                 #{deptId,jdbcType=VARCHAR}
             </foreach>
         </if>
+        <if test="dto.vinCode != null">
+            and t4.vin_code like '%${dto.vinCode}%'
+        </if>
     </select>
 
     <select id="getMerchantListByAuth" resultType="com.jsowell.pile.vo.base.MerchantInfoVO">
diff --git a/jsowell-ui/src/views/member/info/index.vue b/jsowell-ui/src/views/member/info/index.vue
index 1eb7aec6b..d721788ed 100644
--- a/jsowell-ui/src/views/member/info/index.vue
+++ b/jsowell-ui/src/views/member/info/index.vue
@@ -44,6 +44,15 @@
         />
       </el-form-item>
 
+        <el-form-item label="VIN" prop="vinCode">
+            <el-input
+                v-model="queryParams.vinCode"
+                placeholder="请输入VIN"
+                clearable
+                @keyup.enter.native="handleQuery"
+            />
+        </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -266,6 +275,7 @@ export default {
         memberId: null,
         principalBalance: null,
         giftBalance: null,
+          vinCode: null,
       },
       // 表单参数
       form: {},
@@ -295,6 +305,7 @@ export default {
         nickName: this.queryParams.nickName,
         mobileNumber: this.queryParams.mobileNumber,
         merchantId: this.queryParams.merchantId,
+          vinCode: this.queryParams.vinCode,
       }
       console.log("params", params)
       listInfo(params).then(response => {