From ff0af40e39f4d0f828c75302db32382abe2d17fd Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 10 May 2024 17:36:24 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/views/member/userInfo.vue                 | 6 +++---
 .../cardFule/mapper/xml/CardFuelRecordMapper.xml         | 2 +-
 fuintCashierWeb/src/api/cashier/user.js                  | 9 +++++++++
 fuintCashierWeb/src/views/details/index.vue              | 6 +++---
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index 98b1b5b82..afbdee7f5 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -301,7 +301,7 @@
                        v-for="(item,index) in cardFuelDieselList" :key="index"
                        :class="activeKey === index ? 'select' : ''"
                        @click="recharge(index)">
-                    <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>
+<!--                    <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>-->
                     <div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div>
                     <div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div>
                   </div>
@@ -1971,9 +1971,9 @@ export default {
 
   .mon2 {
     width: 20%;
-    height: 75px;
+    height: 70px;
     border: 0.5px #dadfe6 solid;
-    line-height: 25px;
+    line-height: 35px;
     border-radius: 5px;
     text-align: center;
     margin: 0 10px;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml
index f271b11ef..c08d1820c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml
@@ -424,7 +424,7 @@
             mt_user_id = #{cardFuelRecord.mtUserId}
             and store_id = #{cardFuelRecord.storeId}
             and  expire_time > NOW()
-            <if test=" cardFuelRecord.oil_type != null">
+            <if test=" cardFuelRecord.oilType != null and cardFuelRecord.oilType != ''">
                 and oil_type = #{cardFuelRecord.oilType}
             </if>
         </where>
diff --git a/fuintCashierWeb/src/api/cashier/user.js b/fuintCashierWeb/src/api/cashier/user.js
index 548f91d6a..4ea87d4fd 100644
--- a/fuintCashierWeb/src/api/cashier/user.js
+++ b/fuintCashierWeb/src/api/cashier/user.js
@@ -44,4 +44,13 @@ export function getUserVoName(data) {
   })
 }
 
+// 获取用户囤油卡锁价信息
+export function getRecord(data) {
+  return request({
+    url: '/business/marketingActivity/cardFuelRecord/getRecordByUserId',
+    method: 'get',
+    params: data
+  })
+}
+
 
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue
index 6969bfa26..d4b5bab60 100644
--- a/fuintCashierWeb/src/views/details/index.vue
+++ b/fuintCashierWeb/src/views/details/index.vue
@@ -302,7 +302,7 @@
                        v-for="(item,index) in cardFuelDieselList" :key="index"
                        :class="activeKey === index ? 'select' : ''"
                        @click="recharge(index)">
-                    <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>
+<!--                    <div class="top1"><span class="amount1">{{ item.incomeLitres }}</span>L</div>-->
                     <div>售价<span class="amount">{{ item.rechargeBalance }}</span>元</div>
                     <div>锁价<span class="amount">{{ item.lockupPrice }}</span>/升</div>
                   </div>
@@ -2344,9 +2344,9 @@ export default {
 
 .mon2 {
   width: 20%;
-  height: 75px;
+  height: 70px;
   border: 0.5px #dadfe6 solid;
-  line-height: 25px;
+  line-height: 35px;
   border-radius: 5px;
   text-align: center;
   margin: 0 10px;