囤油锁价

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>