From fb45fee42663bf5aae9be60ff1e4c534ab8a7be2 Mon Sep 17 00:00:00 2001
From: fengtianyangyang <5411465+feng_tianyangyang@user.noreply.gitee.com>
Date: Tue, 7 Jun 2022 18:41:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=A2=84=E5=AD=98=E6=AC=BE=E9=87=91=E9=A2=9D=E4=B8=BA?=
 =?UTF-8?q?0=E6=97=A0=E6=B3=95=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/lili/modules/order/order/entity/dos/StoreFlow.java     | 4 ++--
 .../modules/wallet/serviceimpl/MemberWalletServiceImpl.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java
index 9445fc7a..0f9a9ab7 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java
@@ -93,10 +93,10 @@ public class StoreFlow extends BaseIdEntity {
     @ApiModelProperty(value = "平台优惠券 使用金额")
     private Double siteCouponPrice;
 
-    @ApiModelProperty(value = "站点优惠券佣金比例")
+    @ApiModelProperty(value = "站点优惠券补贴比例")
     private Double siteCouponPoint;
 
-    @ApiModelProperty(value = "站点优惠券佣金")
+    @ApiModelProperty(value = "站点优惠券补贴金额")
     private Double siteCouponCommission;
 
     @ApiModelProperty(value = "单品分销返现支出")
diff --git a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java
index 87766492..d411481d 100644
--- a/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/serviceimpl/MemberWalletServiceImpl.java
@@ -168,8 +168,8 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
         //检测会员预存款讯息是否存在，如果不存在则新建
         MemberWallet memberWallet = this.checkMemberWallet(memberWalletUpdateDTO.getMemberId());
         //校验此金额是否超过冻结金额
-        if (0 > CurrencyUtil.sub(memberWallet.getMemberWallet(), memberWalletUpdateDTO.getMoney())) {
-            throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
+        if (0 > CurrencyUtil.sub(memberWallet.getMemberFrozenWallet(), memberWalletUpdateDTO.getMoney())) {
+            throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_FROZEN_AMOUNT_INSUFFICIENT);
         }
         memberWallet.setMemberFrozenWallet(CurrencyUtil.sub(memberWallet.getMemberFrozenWallet(), memberWalletUpdateDTO.getMoney()));
         this.updateById(memberWallet);