From 88db1d93a0b7a35cb27ebb6e861d787e5279b996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Fri, 10 May 2024 17:25:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A4=E6=B2=B9=E9=94=81=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cardFule/mapper/xml/CardFuelRecordMapper.xml    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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 a02702972..f271b11ef 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
@@ -420,10 +420,15 @@
             resultType="com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord">
         select *
         from card_fuel_record
-        where mt_user_id = #{cardFuelRecord.mtUserId}
-        and store_id = #{cardFuelRecord.storeId}
-        order by lockup_price desc
-        limit 1
+        <where>
+            mt_user_id = #{cardFuelRecord.mtUserId}
+            and store_id = #{cardFuelRecord.storeId}
+            and  expire_time > NOW()
+            <if test=" cardFuelRecord.oil_type != null">
+                and oil_type = #{cardFuelRecord.oilType}
+            </if>
+        </where>
+        group by  oil_type
     </select>
 </mapper>