From 854a3242bb49cb6b0af7f700638f7abd11c0bb68 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, 13 Mar 2024 11:18:21 +0800
Subject: [PATCH] bug

---
 .../impl/CardValueRecordServiceImpl.java      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

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 8d8273a3a..076f05512 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
@@ -164,6 +164,22 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             //支付金额
             cardValueOrders.setAmount(cardValueRecordDTO.getBalance());
             cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());
+        }else if(ObjectUtils.isNotEmpty(cardValueRecordDTO.getTypes()) && cardValueRecordDTO.getTypes().equals("0") && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
+
+            //查询储值卡信息
+            cardValue = cardValueService.getOneById(cardValueRecordDTO.getId());
+            cardValueOrders.setCardValueId(cardValue.getId());
+            cardValueOrders.setRechargeType("1");
+            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());
+            }
         }else {
             //查询储值卡信息
             cardValue = cardValueService.getOneById(cardValueRecordDTO.getId());
@@ -244,6 +260,13 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
             //支付金额
             cardValueOrders.setPayAmount(cardValue.getRechargeBalance());
         }
+        if (ObjectUtils.isNotEmpty(cardValue.getGiftBalance()) && ObjectUtils.isNotEmpty(cardValueRecordDTO.getBalance())){
+            //订单金额
+            BigDecimal add = BigDecimal.valueOf(cardValue.getRechargeBalance()).add(BigDecimal.valueOf(cardValue.getGiftBalance()));
+            cardValueOrders.setAmount(add.doubleValue() + cardValueRecordDTO.getBalance());
+            //支付金额
+            cardValueOrders.setPayAmount(cardValueRecordDTO.getBalance());
+        }
         //支付金额
         //优惠券id
         if (ObjectUtils.isNotEmpty(cardValueRecordDTO.getCardFavorableId())){