From 11863192fc7faa52acf52fc6a5ea020424946dcc Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Mon, 28 Aug 2023 17:52:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserMakerQuota/impl/UserMakerQuotaServiceImpl.java       | 5 +++--
 .../platform/userAccount/impl/UserAccountServiceImpl.java    | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java
index c88f7da..2fe275e 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/UserMakerQuota/impl/UserMakerQuotaServiceImpl.java
@@ -30,6 +30,7 @@ import java.util.*;
  */
 @Service
 @Slf4j
+@Transactional
 public class UserMakerQuotaServiceImpl extends ServiceImpl<UserMakerQuotaMapper, UserMakerQuota> implements UserMakerQuotaService {
     @Resource
     private UserMakerQuotaMapper userMakerQuotaMapper;
@@ -118,7 +119,7 @@ public class UserMakerQuotaServiceImpl extends ServiceImpl<UserMakerQuotaMapper,
                 //提现金额
                 userAccountService.modFunds(userInfo.getUserId().intValue(), "LD", "增加收益", profit, "");
                 //额度改变
-                modMakerFunds(userInfo.getUserId().intValue(), "LD", "收款消耗", bigDecimal, "",order.getOrderNumber());
+                modMakerFunds(userInfo.getUserId().intValue(), "LD", "收款消耗", bigDecimal.negate(), "",order.getOrderNumber());
                 return;
             }
 
@@ -126,7 +127,7 @@ public class UserMakerQuotaServiceImpl extends ServiceImpl<UserMakerQuotaMapper,
                 BigDecimal  profit=userMakerQuota.getAmount().multiply(new BigDecimal("0.0038")).setScale(2, BigDecimal.ROUND_DOWN);
 
                 //提现金额
-                userAccountService.modFunds(userInfo.getUserId().intValue(), "LD", "增加收益", profit.abs().negate(), "");
+                userAccountService.modFunds(userInfo.getUserId().intValue(), "LD", "增加收益", profit.abs(), "");
                 modMakerFunds(userInfo.getUserId().intValue(), "LD", "收款消耗", userMakerQuota.getAmount().abs().negate(), "",order.getOrderNumber());
                 return;
             }
diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAccount/impl/UserAccountServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAccount/impl/UserAccountServiceImpl.java
index 54305bc..319b9ea 100644
--- a/pluss-service-bundle/src/main/java/cn/pluss/platform/userAccount/impl/UserAccountServiceImpl.java
+++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/userAccount/impl/UserAccountServiceImpl.java
@@ -121,7 +121,10 @@ public class UserAccountServiceImpl extends ServiceImpl<UserAccountMapper, UserA
             difference=difference.abs();
         }
 
-        userAccountMapper.updateBanlance(userId,difference);
+
+        userAccount.setBalance(userAccount.getBalance().add(difference));
+        userAccount.setUpdateTime(new Date());
+        userAccountMapper.updateById(userAccount);
 
         UserAccountFlow flow=new UserAccountFlow();
         flow.setUserId(userId);