From 48c84acb7ca9fb3171269fe4bc86ed636c816f91 Mon Sep 17 00:00:00 2001
From: lele0521 <lele190626@gmail.com>
Date: Thu, 25 Jan 2024 18:39:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=86=E9=94=80=E6=8F=90=E7=8E=B0bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../serviceimpl/DistributionCashServiceImpl.java  | 15 ++++++++-------
 .../wallet/entity/enums/WithdrawStatusEnum.java   | 10 ++++++++++
 .../cn/lili/rocketmq/tags/MemberTagsEnum.java     |  4 ++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
index 122b23d2e..51701d094 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java
@@ -138,17 +138,18 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
                     distribution.setCanRebate(CurrencyUtil.add(distribution.getCanRebate(), distributorCash.getPrice()));
                     distributorCash.setDistributionCashStatus(WithdrawStatusEnum.FAIL_AUDITING.name());
                 }
+                distribution.setCommissionFrozen(CurrencyUtil.sub(distribution.getCommissionFrozen(), distributorCash.getPrice()));
                 //分销员金额相关处理
                 distributionService.updateById(distribution);
                 //修改分销提现申请
                 boolean bool = this.updateById(distributorCash);
-                if (bool) {
-                    //组织会员提现审核消息
-                    memberWithdrawalMessage.setMemberId(distribution.getMemberId());
-                    memberWithdrawalMessage.setPrice(distributorCash.getPrice());
-                    String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_WITHDRAWAL.name();
-                    rocketMQTemplate.asyncSend(destination, memberWithdrawalMessage, RocketmqSendCallbackBuilder.commonCallback());
-                }
+                //if (bool) {
+                //    //组织会员提现审核消息
+                //    memberWithdrawalMessage.setMemberId(distribution.getMemberId());
+                //    memberWithdrawalMessage.setPrice(distributorCash.getPrice());
+                //    String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_WITHDRAWAL.name();
+                //    rocketMQTemplate.asyncSend(destination, memberWithdrawalMessage, RocketmqSendCallbackBuilder.commonCallback());
+                //}
                 return distributorCash;
             }
             throw new ServiceException(ResultCode.DISTRIBUTION_NOT_EXIST);
diff --git a/framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java
index d5f91e733..69712aea9 100644
--- a/framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java
+++ b/framework/src/main/java/cn/lili/modules/wallet/entity/enums/WithdrawStatusEnum.java
@@ -15,10 +15,20 @@ public enum WithdrawStatusEnum {
      * 审核成功即提现成功
      */
     VIA_AUDITING("审核通过"),
+    /**
+     * 分销提现
+     * 审核成功即提现成功
+     */
+    D_VIA_AUDITING("分销提现审核通过"),
     /**
      * 审核未通过
      */
     FAIL_AUDITING("审核未通过"),
+    /**
+     * 分销提现
+     * 审核未通过
+     */
+    D_FAIL_AUDITING("分销提现审核未通过"),
     /**
      * 提现成功
      */
diff --git a/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java
index 2781da0ab..4c06984d5 100644
--- a/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java
+++ b/framework/src/main/java/cn/lili/rocketmq/tags/MemberTagsEnum.java
@@ -23,6 +23,10 @@ public enum MemberTagsEnum {
      * 会员提现
      */
     MEMBER_WITHDRAWAL("会员提现"),
+    /**
+     * 会员提现
+     */
+    DISTRIBUTION_WITHDRAWAL("分销提现"),
     /**
      * 会员信息更改
      */