From f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 07 八月 2023 11:34:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
index 4fe4c9f..0c0868e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RechargeRecordsServiceImpl.java
@@ -168,9 +168,8 @@
         BigDecimal amount = BigDecimal.ZERO;
         if (rechargeConfig.size() > 0){
             for (Map<String, Object> stringObjectMap : rechargeConfig) {
-                Integer chargeId = (Integer) stringObjectMap.get("chargeId");
-                if (chargeId.equals(request.getChargeId())) {
-                    Long o = (Long) stringObjectMap.get("money");
+                Long o = (Long) stringObjectMap.get("money");
+                if (BigDecimal.valueOf(o).compareTo(request.getAmount()) == 0) {
                     amount = BigDecimal.valueOf(o);
                     rechargeRecords.setAmount(BigDecimal.valueOf(o));
                     if (tAppUser.getIsVip() == 1) {

--
Gitblit v1.7.1