From 46a0106ab7108ae3b00ae1b0a16bc12ab039e7b4 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: Tue, 9 Apr 2024 16:01:14 +0800
Subject: [PATCH] bug

---
 .../service/impl/ActiveExchangeServiceImpl.java            | 4 ++++
 .../cardFavorable/mapper/xml/CardFavorableRecordMapper.xml | 2 +-
 .../service/impl/CardFavorableRecordServiceImpl.java       | 7 ++++++-
 .../cardValue/service/impl/CardValueRecordServiceImpl.java | 7 ++++++-
 .../com/fuint/business/order/mapper/xml/OilOrderMapper.xml | 1 +
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
index da9cc2e46..d3ac9d0a9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
@@ -602,6 +602,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
                 canUserCardFavorableList.add(cardFavorableRecordVO);
             }else if(!paymentActiveDTO.getType().equals("0")){
                 canUserCardFavorableList.add(cardFavorableRecordVO);
+            }else if (paymentActiveDTO.getType().equals("0") && ObjectUtils.isEmpty(cardFavorableRecordVO.getExclusiveFunction())){
+                canUserCardFavorableList.add(cardFavorableRecordVO);
             }
         }
            /* if () {
@@ -665,6 +667,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
                         }
                     }else if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && !cardFavorableRecordVO.getExclusiveFunction().contains("2")){
                         cardFavorableRecordVOS.add(cardFavorableRecordVO);
+                    }else if (StringUtils.isEmpty(cardFavorableRecordVO.getExclusiveFunction())){
+                        cardFavorableRecordVOS.add(cardFavorableRecordVO);
                     }
                 }
             }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
index 021f78330..63b0221d5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
@@ -123,7 +123,7 @@
                 LEFT JOIN card_exchange ce ON cer.card_exchange_id = ce.id
         WHERE
             cer.mt_user_id = #{cardFavorableDTOS.id}
-          and ce.type = 0
+          and ce.type = 0 or ce.type = 1
         <if test="cardFavorableDTOS.useStatus!=null and cardFavorableDTOS.useStatus != ''">
             and cer.status = #{cardFavorableDTOS.useStatus}
         </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
index 5f900aae1..02dfd8430 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
@@ -301,7 +301,12 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
         }
         cardFavorableService.updateById(cardFavorable);
         cardFavorableRecord.setSatisfiedAmount(cardFavorable.getSatisfiedAmount());
-        cardFavorableRecord.setDiscountAmount(cardFavorable.getDiscountAmount());
+        if (cardFavorable.getDiscountType().equals("1")){
+            double v = cardFavorable.getSatisfiedAmount() * (1 - (cardFavorable.getSpecialDiscount() * 0.1));
+            cardFavorableRecord.setDiscountAmount(v);
+        }else {
+            cardFavorableRecord.setDiscountAmount(cardFavorable.getDiscountAmount());
+        }
         return save(cardFavorableRecord);
     }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
index 06a3c08ad..20d66fc47 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
@@ -948,7 +948,12 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
                             }
                         }
                         cardFavorableRecord.setSatisfiedAmount(cardValueVoucher.getSatisfiedAmount());
-                        cardFavorableRecord.setDiscountAmount(cardValueVoucher.getDiscountAmount());
+                        if (cardValueVoucher.getDiscountType().equals("1")){
+                            double v = cardValueVoucher.getSatisfiedAmount() * (1 - (cardValueVoucher.getSpecialDiscount() * 0.1));
+                            cardFavorableRecord.setDiscountAmount(v);
+                        }else {
+                            cardFavorableRecord.setDiscountAmount(cardValueVoucher.getDiscountAmount());
+                        }
                         cardFavorableRecordService.save(cardFavorableRecord);
                     }
                 /*
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 8a055d6ab..31c976ecc 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
@@ -485,6 +485,7 @@
         where ac.store_id = #{storeId}
           and ac.status = 0
           and ac.participation_condition_money &lt;= #{amount}
+        and ac.active_end_time > CURRENT_TIMESTAMP
           group by ac.id
     </select>
     <select id="orderStatistics" resultType="java.util.Map">