From 1774597789239127081d7aeaa555d9338c17e456 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, 19 Jan 2024 10:27:49 +0800
Subject: [PATCH] bug

---
 .../com/fuint/business/order/mapper/xml/OilOrderMapper.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index 3a586f7ab..6663410a8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -354,8 +354,8 @@
             ad.adapt_oil oilId,
             ad.limit_acount as limitAcount,
             ad.participation_condition,
-            (case ad.store_id when ${storeId} then adc.amount * (1-(adc.discount * 0.1))
-                end) as discount
+            max((case ad.store_id when ${storeId} then adc.amount * (1-(adc.discount * 0.1))
+                end)) as discount
         FROM
             active_discount ad
             LEFT JOIN active_discount_child adc ON ad.id = adc.active_discount_id
@@ -378,7 +378,7 @@
             af.adapt_oil oilId,
             af.limit_acount as limitAcount,
             af.participation_condition,
-            adc.deduction_amount discount
+            max(adc.deduction_amount) discount
         FROM
             active_fullminus af
                 LEFT JOIN active_discount_child adc ON af.id = adc.active_fullminus_id