From a89a6c5c2745b466c224c6df05c30d5fc945df0b 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: Wed, 5 Jun 2024 15:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CardValueRecordServiceImpl.java      | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

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 4211b524f..84c56b507 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
@@ -170,11 +170,17 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             cardValueOrders.setRechargeType("1");
             cardValueOrders.setBidBalance(cardValue.getBidBalance());
             cardValueOrders.setRechargeBalance(cardValue.getRechargeBalance());
-            if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance())){
+            if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance()) && cardValueRecordDTO.getBalance() >= cardValue.getRechargeBalance()){
                 cardValueOrders.setGiftBalance(cardValue.getGiftBalance());
+                cardValueOrders.setPoints(cardValue.getPoints());
+                cardValueOrders.setGrowthValue(cardValue.getGrowthValue());
+            }else {
+                cardValueOrders.setGiftBalance(0.0);
+                cardValueOrders.setPoints(0);
+                cardValueOrders.setGrowthValue(0);
             }
-            cardValueOrders.setPoints(cardValue.getPoints());
-            cardValueOrders.setGrowthValue(cardValue.getGrowthValue());
+            cardValueOrders.setAmount(cardValueRecordDTO.getBalance() + cardValueOrders.getGiftBalance());
+            cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());
             if (ObjectUtils.isNotEmpty(cardValue.getFringeBenefit())){
                 cardValueOrders.setFringeBenefit(cardValue.getFringeBenefit());
             }
@@ -201,20 +207,6 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
                 cardValueOrders.setFringeBenefit(cardValue.getFringeBenefit());
             }
         }
-        //查询储值卡信息
-       /* CardValueVO cardValue = cardValueService.getOneById(cardValueRecordDTO.getId());
-        cardValueOrders.setCardValueId(cardValue.getId());
-        cardValueOrders.setRechargeType("0");
-        cardValueOrders.setBidBalance(cardValue.getBidBalance());
-        cardValueOrders.setRechargeBalance(cardValue.getRechargeBalance());
-        if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance())){
-            cardValueOrders.setGiftBalance(cardValue.getGiftBalance());
-        }
-        cardValueOrders.setPoints(cardValue.getPoints());
-        cardValueOrders.setGrowthValue(cardValue.getGrowthValue());
-        if (ObjectUtils.isNotEmpty(cardValue.getFringeBenefit())){
-            cardValueOrders.setFringeBenefit(cardValue.getFringeBenefit());
-        }*/
         //优惠券优惠金额
         if (ObjectUtils.isNotEmpty(cardValueRecordDTO.getCardFavorableId())){
             CardFavorable cardFavorable = cardFavorableService.getById(cardValueRecordDTO.getCardFavorableId());
@@ -258,14 +250,16 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             cardValueOrders.setAmountCommission(cardValue.getAmountCommission());
         }
         //订单金额
-        if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance())){
+        if (!cardValueRecordDTO.getTypes().equals("1")
+                && ObjectUtils.isNotEmpty(cardValue.getGiftBalance())){
             //订单金额
             BigDecimal add = BigDecimal.valueOf(cardValue.getRechargeBalance()).add(BigDecimal.valueOf(cardValue.getGiftBalance()));
             cardValueOrders.setAmount(add.doubleValue());
             //支付金额
             cardValueOrders.setPayAmount(cardValue.getRechargeBalance());
         }
-        if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance()) && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
+        if (!cardValueRecordDTO.getTypes().equals("1")
+                && ObjectUtils.isNotEmpty(cardValue.getGiftBalance()) && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
             //订单金额
             BigDecimal add = BigDecimal.valueOf(cardValue.getGiftBalance());
             cardValueOrders.setAmount(add.doubleValue() + cardValueRecordDTO.getBalance());
@@ -282,7 +276,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             cardValueOrders.setCardRecordId(cardValueRecordDTO.getCardRecordId());
         }
         //优惠金额
-        if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance())){
+        if (!cardValueRecordDTO.getTypes().equals("1")
+                && ObjectUtils.isNotEmpty(cardValue.getGiftBalance())){
             BigDecimal add = BigDecimal.valueOf(cardValue.getGiftBalance()).add(BigDecimal.valueOf(cardFavorableValue));
             cardValueOrders.setDiscount(add.doubleValue());
         }