From b01a1ebfbd65247abae6f245a1d32064b5633ddb Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Fri, 9 Aug 2024 08:47:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=8D=A0=E6=A1=A9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=90=8E=E7=AE=A1=E9=A1=B5=E9=9D=A2=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/pile/OrderPileOccupyMapper.xml   | 1 +
 jsowell-ui/src/views/pile/occupy/index.vue                 | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
index e5dfc2605..a73b8aa74 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml
@@ -1017,6 +1017,7 @@
             <if test="dto.stationId != null  and dto.stationId != ''"> and t1.station_id = #{dto.stationId}</if>
             <if test="dto.plateNumber != null  and dto.plateNumber != ''"> and t1.plate_number = #{dto.plateNumber}</if>
             <if test="dto.status != null  and dto.status != ''"> and t1.status = #{dto.status}</if>
+            <if test="dto.payStatus != null  and dto.payStatus != ''"> and t1.pay_status = #{dto.payStatus}</if>
             <if test="dto.startTime != null "> and t1.start_time = #{dto.startTime}</if>
             <if test="dto.orderAmount != null "> and t1.order_amount = #{dto.orderAmount}</if>
             <if test="dto.pileSn != null  and dto.pileSn != ''"> and t1.pile_sn = #{dto.pileSn}</if>
diff --git a/jsowell-ui/src/views/pile/occupy/index.vue b/jsowell-ui/src/views/pile/occupy/index.vue
index c5b2f3f51..8dea5df0e 100644
--- a/jsowell-ui/src/views/pile/occupy/index.vue
+++ b/jsowell-ui/src/views/pile/occupy/index.vue
@@ -7,6 +7,13 @@
       <el-form-item label="会员id" prop="memberId">
         <el-input v-model="queryParams.memberId" placeholder="请输入会员id" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+        <el-form-item label="支付状态" prop="payStatus">
+            <el-select v-model="queryParams.payStatus" placeholder="请选择支付状态" clearable filterable
+                       style="width: 140px">
+            <el-option v-for="item in dict.type.occupy_pay_status" :key="item.value" :label="item.label"
+                       :value="item.value"/>
+            </el-select>
+        </el-form-item>
       <!--      <el-form-item label="充电站id" prop="stationId">-->
       <!--        <el-input v-model="queryParams.stationId" placeholder="请输入充电站id" clearable @keyup.enter.native="handleQuery" />-->
       <!--      </el-form-item>-->