From 0764681375ac65351a24208432056bad5702ff19 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Jun 2022 18:01:34 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 55cc8e8..7b8589a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -424,7 +424,7 @@
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(memberId);
BigDecimal profit = mallMoneyFlowMapper.selectProfitByDateAndMemberId(memberId);
- BigDecimal canMoney = wallet.getBalance();
+ BigDecimal canMoney = wallet.getCommission();
if (profit != null) {
if(canMoney.compareTo(BigDecimal.ZERO) > 0) {
canMoney = canMoney.subtract(profit);
--
Gitblit v1.9.1