From 8fc2ba38078ddbbb1c295ab1e6e4a5ca802cb2ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=AD=94=E4=BB=99=7E?=
 <13068499+willowhh@user.noreply.gitee.com>
Date: Thu, 19 Dec 2024 22:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=85=E5=80=BC=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/NgUserRechargeRecords.java         |  1 +
 .../impl/UserRechargeCardsServiceImpl.java    | 29 +++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java
index 35cf676..56e1632 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/domain/NgUserRechargeRecords.java
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fastbee.common.annotation.Excel;
diff --git a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
index efbeba4..5f0766d 100644
--- a/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
+++ b/fastbee-service/fastbee-rechargecard-service/src/main/java/com/fastbee/rechargecard/service/impl/UserRechargeCardsServiceImpl.java
@@ -129,7 +129,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
             // 如果没有找到对应的记录，返回0或者一个错误码
             return 0;
         }
-        /*UserConsumptionDetails userConsumptionDetails=new UserConsumptionDetails();
+        UserConsumptionDetails userConsumptionDetails=new UserConsumptionDetails();
         userConsumptionDetails.setUserId(info.getUserId());
         userConsumptionDetails.setCardNumber(info.getCardNumber());
         userConsumptionDetails.setBillingType(0);
@@ -141,13 +141,7 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
         userConsumptionDetails.setStatus(0);
         userConsumptionDetails.setAreaCode(rechargecardUser.getAreacode());
         userConsumptionDetails.setCreateTime(DateUtils.getNowDate());
-
-        NgUserRechargeRecords ngUserRechargeRecords=new NgUserRechargeRecords();
-        ngUserRechargeRecords.setUserId(info.getUserId());*/
-
-        // 计算新的余额
-        /*BigDecimal newBalance = rechargecardUser.getNumber().add(info.getBalance());
-        UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder()
+        /*UserConsumptionDetails userConsumptionDetails = UserConsumptionDetails.builder()
                 .userId(info.getUserId())
                 .cardNumber(info.getCardNumber())
                 .billingType(0)
@@ -159,6 +153,19 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
                 .status(0)
                 .areaCode(rechargecardUser.getAreacode()) // 假设 getAreacode() 方法返回区域代码
                 .build();*/
+        NgUserRechargeRecords ngUserRechargeRecords=new NgUserRechargeRecords();
+        ngUserRechargeRecords.setUserId(info.getUserId());
+        ngUserRechargeRecords.setUserName(info.getUserName());
+        ngUserRechargeRecords.setCardNumber(info.getCardNumber());
+        ngUserRechargeRecords.setAreaCode(rechargecardUser.getAreacode());
+        ngUserRechargeRecords.setType(rechargecardUser.getStatus());
+        ngUserRechargeRecords.setAmount(rechargecardUser.getNumber());
+        ngUserRechargeRecords.setBalance(info.getBalance());
+        ngUserRechargeRecords.setRechargeTime(DateUtils.getNowDate());
+        ngUserRechargeRecords.setStatus(0);
+        ngUserRechargeRecords.setAreaCode(rechargecardUser.getAreacode());
+        // 计算新的余额
+        BigDecimal newBalance = rechargecardUser.getNumber().add(info.getBalance());
 
 
 
@@ -171,15 +178,13 @@ public class UserRechargeCardsServiceImpl implements IUserRechargeCardsService
                 .rechargeCode(null).status(0).serialNumber(null).deviceNumber(null).projectId(null)
                 .deptId(null)
                 .areaCode(rechargecardUser.getAreacode())
-                .build();
+                .build();*/
         userRechargeRecordsMapper.insertNgUserRechargeRecords(ngUserRechargeRecords);
         userConsumptionDetailsMapper.insertUserConsumptionDetails(userConsumptionDetails);
         // 更新用户充值卡信息，包括新的余额
         info.setBalance(newBalance);
         info.setUpdateTime(DateUtils.getNowDate());
         info.setAreaCode(rechargecardUser.getAreacode());
-        return userRechargeCardsMapper.updateUserRechargeCards(info);*/
-
-        return 1;
+        return userRechargeCardsMapper.updateUserRechargeCards(info);
     }
 }