From 14fb851ab48ef31ad5973e07cc03118e481cd9bb Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Mon, 1 Jul 2024 23:05:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/app/AppUserMoneyController.java        | 8 ++++----
 .../shopping/service/impl/SelfOrdersServiceImpl.java      | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java
index 1df32ae..a9d88a1 100644
--- a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java
+++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java
@@ -107,12 +107,12 @@ public class AppUserMoneyController {
         BigDecimal outgoing = new BigDecimal(outgoingLong);
         BigDecimal balance = income.subtract(outgoing);
 
-        BigDecimal ktxje = userMoney.getMoney().subtract(balance);
-        if(ktxje.compareTo(BigDecimal.ZERO) < 0){
-            ktxje = BigDecimal.ZERO;
+//        BigDecimal ktxje = userMoney.getMoney().subtract(balance);
+        if(balance.compareTo(BigDecimal.ZERO) < 0){
+            balance = BigDecimal.ZERO;
         }
         //插入可提现金额
-        userMoneyResult.setWithdrawableAmount(ktxje);
+        userMoneyResult.setWithdrawableAmount(balance);
         return Result.success().put("data",userMoneyResult);
     }
 
diff --git a/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java b/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java
index 7ccfc08..aa1c250 100644
--- a/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/shopping/service/impl/SelfOrdersServiceImpl.java
@@ -596,6 +596,8 @@ public class SelfOrdersServiceImpl implements OrdersService {
             userMoneyDetails.setType(2);
             userMoneyDetails.setMoney(BigDecimal.valueOf(payMoney));
             userMoneyDetails.setCreateTime(date);
+            userMoneyDetails.setBlRole(2);
+            userMoneyDetails.setBlFlag(1);
             userMoneyDetailsService.save(userMoneyDetails);
             //订单分销
             this.fenXiao(orders);