From a7f26ff19e3b3bd889745bdff46915ed5ff8213d Mon Sep 17 00:00:00 2001
From: pikachu <1321288662@qq.com>
Date: Tue, 27 Jul 2021 19:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lili/event/impl/NoticeMessageExecute.java | 61 ++++++++++---------
 .../entity/dos/DistributionCash.java          |  4 +-
 .../enums/DistributionCashStatusEnum.java     | 29 ---------
 .../DistributionCashServiceImpl.java          | 16 ++---
 .../serviceimpl/MemberWalletServiceImpl.java  | 22 +++++++
 .../MemberWithdrawApplyServiceImpl.java       | 30 +++++++--
 .../entity/enums/NoticeMessageNodeEnum.java   |  3 +-
 update-sql/li_notice_message.sql              |  5 +-
 8 files changed, 95 insertions(+), 75 deletions(-)
 delete mode 100644 framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java

diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
index b8f89811..dbd7032f 100644
--- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
+++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
@@ -1,10 +1,10 @@
 package cn.lili.event.impl;
 
 import cn.lili.event.*;
-import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
 import cn.lili.modules.member.entity.dto.MemberPointMessage;
 import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
 import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
+import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
 import cn.lili.modules.message.entity.dto.NoticeMessageDTO;
 import cn.lili.modules.message.entity.enums.NoticeMessageNodeEnum;
 import cn.lili.modules.message.entity.enums.NoticeMessageParameterEnum;
@@ -172,34 +172,28 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
 
     @Override
     public void memberWithdrawal(MemberWithdrawalMessage memberWithdrawalMessage) {
+        NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
+        noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
         //如果提现状态为申请则发送申请提现站内消息
-        if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.APPLY.name())){
-            //如果提现到余额
-            if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
-                NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
-                noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
-                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_CREATE);
-                Map<String, String> params = new HashMap<>(2);
-                params.put("price", memberWithdrawalMessage.getPrice().toString());
-                noticeMessageDTO.setParameter(params);
-                //发送提现申请成功消息
-                noticeMessageService.noticeMessage(noticeMessageDTO);
-            }
+        if (memberWithdrawalMessage.getStatus().equals(WithdrawStatusEnum.APPLY.name())) {
+            noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_CREATE);
+            Map<String, String> params = new HashMap<>(2);
+            params.put("price", memberWithdrawalMessage.getPrice().toString());
+            noticeMessageDTO.setParameter(params);
+            //发送提现申请成功消息
+            noticeMessageService.noticeMessage(noticeMessageDTO);
         }
         //如果提现状态为通过则发送审核通过站内消息
-        if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.PASS.name())){
+        if (memberWithdrawalMessage.getStatus().equals(WithdrawStatusEnum.VIA_AUDITING.name())) {
             //如果提现到余额
             if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
                 //组织参数
-                NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
-                noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
                 Map<String, String> params = new HashMap<>(2);
                 params.put("income", memberWithdrawalMessage.getPrice().toString());
                 noticeMessageDTO.setParameter(params);
                 noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_SUCCESS);
                 //发送提现成功消息
                 noticeMessageService.noticeMessage(noticeMessageDTO);
-
                 params.put("income", memberWithdrawalMessage.getPrice().toString());
                 params.put("expenditure", "0");
                 noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE);
@@ -207,23 +201,32 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
                 //发送余额变动消息
                 noticeMessageService.noticeMessage(noticeMessageDTO);
             }
-        }
-        //如果提现状态为拒绝则发送审核拒绝站内消息
-        if(memberWithdrawalMessage.getStatus().equals(DistributionCashStatusEnum.REFUSE.name())){
-            //如果提现到余额
-            if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WALLET.name())) {
-                NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
-                noticeMessageDTO.setMemberId(memberWithdrawalMessage.getMemberId());
-                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_ERROR);
+            //如果提现到微信
+            if (memberWithdrawalMessage.getDestination().equals(MemberWithdrawalDestinationEnum.WECHAT.name())) {
                 Map<String, String> params = new HashMap<>(2);
-                params.put("price", memberWithdrawalMessage.getPrice().toString());
+                params.put("income", memberWithdrawalMessage.getPrice().toString());
                 noticeMessageDTO.setParameter(params);
-                //发送提现申请成功消息
+                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_WEICHAT_SUCCESS);
+                //发送提现成功消息
+                noticeMessageService.noticeMessage(noticeMessageDTO);
+
+                params.put("income", "0");
+                params.put("expenditure", memberWithdrawalMessage.getPrice().toString());
+                noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_CHANGE);
+                noticeMessageDTO.setParameter(params);
+                //发送余额变动消息
                 noticeMessageService.noticeMessage(noticeMessageDTO);
             }
         }
-
-
+        //如果提现状态为拒绝则发送审核拒绝站内消息
+        if (memberWithdrawalMessage.getStatus().equals(WithdrawStatusEnum.FAIL_AUDITING.name())) {
+            noticeMessageDTO.setNoticeMessageNodeEnum(NoticeMessageNodeEnum.WALLET_WITHDRAWAL_ERROR);
+            Map<String, String> params = new HashMap<>(2);
+            params.put("price", memberWithdrawalMessage.getPrice().toString());
+            noticeMessageDTO.setParameter(params);
+            //发送提现申请成功消息
+            noticeMessageService.noticeMessage(noticeMessageDTO);
+        }
 
 
     }
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
index 65e612f3..4d33d442 100644
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
+++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java
@@ -1,7 +1,7 @@
 package cn.lili.modules.distribution.entity.dos;
 
+import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
 import cn.lili.mybatis.BaseEntity;
-import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -59,7 +59,7 @@ public class DistributionCash extends BaseEntity {
         this.sn = sn;
         this.distributionId = distributionId;
         this.price = price;
-        this.distributionCashStatus = DistributionCashStatusEnum.APPLY.name();
+        this.distributionCashStatus = WithdrawStatusEnum.APPLY.name();
         this.distributionName = memberName;
     }
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java
deleted file mode 100644
index ff1cc2ca..00000000
--- a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.lili.modules.distribution.entity.enums;
-
-/**
- * 分销佣金状态
- *
- * @author pikachu
- * @since 2020-03-14 23:04:56
- */
-public enum DistributionCashStatusEnum {
-    /**
-     * 待处理
-     */
-    APPLY("待处理"),
-    /**
-     * 通过
-     */
-    PASS("通过"),
-    /**
-     * 拒绝
-     */
-    REFUSE("拒绝");
-
-
-    private final String description;
-
-    DistributionCashStatusEnum(String description) {
-        this.description = description;
-    }
-}
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 dc46f394..44125319 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
@@ -2,6 +2,7 @@ package cn.lili.modules.distribution.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
 import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
 import cn.lili.rocketmq.tags.MemberTagsEnum;
 import cn.lili.common.utils.CurrencyUtil;
@@ -11,7 +12,6 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.distribution.entity.dos.Distribution;
 import cn.lili.modules.distribution.entity.dos.DistributionCash;
-import cn.lili.modules.distribution.entity.enums.DistributionCashStatusEnum;
 import cn.lili.modules.distribution.entity.enums.DistributionStatusEnum;
 import cn.lili.modules.distribution.entity.vos.DistributionCashSearchParams;
 import cn.lili.modules.distribution.mapper.DistributionCashMapper;
@@ -84,7 +84,7 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
                 memberWithdrawalMessage.setMemberId(distribution.getMemberId());
                 memberWithdrawalMessage.setPrice(applyMoney);
                 memberWithdrawalMessage.setDestination(MemberWithdrawalDestinationEnum.WALLET.name());
-                memberWithdrawalMessage.setStatus(DistributionCashStatusEnum.APPLY.name());
+                memberWithdrawalMessage.setStatus(WithdrawStatusEnum.APPLY.name());
                 String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_WITHDRAWAL.name();
                 rocketMQTemplate.asyncSend(destination, memberWithdrawalMessage, RocketmqSendCallbackBuilder.commonCallback());
                 return true;
@@ -125,8 +125,8 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
             if (distribution != null && distributorCash != null && distribution.getDistributionStatus().equals(DistributionStatusEnum.PASS.name())) {
                 MemberWithdrawalMessage memberWithdrawalMessage = new MemberWithdrawalMessage();
                 //审核通过
-                if (result.equals(DistributionCashStatusEnum.PASS.name())) {
-                    memberWithdrawalMessage.setStatus(DistributionCashStatusEnum.PASS.name());
+                if (result.equals(WithdrawStatusEnum.VIA_AUDITING.name())) {
+                    memberWithdrawalMessage.setStatus(WithdrawStatusEnum.VIA_AUDITING.name());
                     //审核通过需要校验冻结金额不足情况
                     if (distribution.getCommissionFrozen() < distributorCash.getPrice()) {
                         throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
@@ -134,17 +134,17 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
                     //分销员佣金解冻
                     distribution.setCommissionFrozen(CurrencyUtil.sub(distribution.getCommissionFrozen(), distributorCash.getPrice()));
                     //分销记录操作
-                    distributorCash.setDistributionCashStatus(DistributionCashStatusEnum.PASS.name());
+                    distributorCash.setDistributionCashStatus(WithdrawStatusEnum.VIA_AUDITING.name());
                     distributorCash.setPayTime(new Date());
                     //提现到余额
                     memberWalletService.increase(distributorCash.getPrice(), distribution.getMemberId(), "分销佣金提现到余额", DepositServiceTypeEnum.WALLET_COMMISSION.name());
                 } else {
-                    memberWithdrawalMessage.setStatus(DistributionCashStatusEnum.REFUSE.name());
+                    memberWithdrawalMessage.setStatus(WithdrawStatusEnum.FAIL_AUDITING.name());
                     //分销员佣金解冻
                     distribution.setCommissionFrozen(CurrencyUtil.sub(distribution.getCommissionFrozen(), distributorCash.getPrice()));
                     //分销员可提现金额退回
                     distribution.setCanRebate(CurrencyUtil.add(distribution.getCanRebate(), distributorCash.getPrice()));
-                    distributorCash.setDistributionCashStatus(DistributionCashStatusEnum.REFUSE.name());
+                    distributorCash.setDistributionCashStatus(WithdrawStatusEnum.FAIL_AUDITING.name());
                 }
                 //分销员金额相关处理
                 distributionService.updateById(distribution);
@@ -169,7 +169,7 @@ public class DistributionCashServiceImpl extends ServiceImpl<DistributionCashMap
     @Override
     public Integer newDistributionCash() {
         QueryWrapper queryWrapper = Wrappers.query();
-        queryWrapper.eq("distribution_cash_status", DistributionCashStatusEnum.APPLY.name());
+        queryWrapper.eq("distribution_cash_status", WithdrawStatusEnum.APPLY.name());
         return this.count(queryWrapper);
     }
 }
\ No newline at end of file
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
index e4451089..cdfe1cdf 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java
@@ -3,6 +3,7 @@ package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
+import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.utils.CurrencyUtil;
@@ -11,6 +12,8 @@ import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.member.entity.dos.Member;
 import cn.lili.modules.member.entity.dos.MemberWallet;
 import cn.lili.modules.member.entity.dos.MemberWithdrawApply;
+import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
 import cn.lili.modules.member.entity.enums.WithdrawStatusEnum;
 import cn.lili.modules.member.entity.vo.MemberWalletVO;
 import cn.lili.modules.member.mapper.MemberWalletMapper;
@@ -24,9 +27,12 @@ import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.WithdrawalSetting;
 import cn.lili.modules.system.entity.enums.SettingEnum;
 import cn.lili.modules.system.service.SettingService;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -45,6 +51,12 @@ import java.util.Date;
 @Transactional(rollbackFor = Exception.class)
 public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, MemberWallet> implements MemberWalletService {
 
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
+
+    @Autowired
+    private RocketmqCustomProperties rocketmqCustomProperties;
+
     /**
      * 预存款日志
      */
@@ -230,6 +242,7 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
      */
     @Override
     public Boolean applyWithdrawal(Double price) {
+        MemberWithdrawalMessage memberWithdrawalMessage = new MemberWithdrawalMessage();
         AuthUser authUser = UserContext.getCurrentUser();
         //构建审核参数
         MemberWithdrawApply memberWithdrawApply = new MemberWithdrawApply();
@@ -251,15 +264,24 @@ public class MemberWalletServiceImpl extends ServiceImpl<MemberWalletMapper, Mem
                 if (memberWalletVO.getMemberWallet() < price) {
                     throw new ServiceException(ResultCode.WALLET_WITHDRAWAL_INSUFFICIENT);
                 }
+                memberWithdrawalMessage.setStatus(WithdrawStatusEnum.VIA_AUDITING.name());
                 //微信零钱提现
                 Boolean result = withdrawal(memberWithdrawApply);
                 if (result) {
                     this.reduce(price, authUser.getId(), "余额提现成功", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
                 }
             } else {
+                memberWithdrawalMessage.setStatus(WithdrawStatusEnum.APPLY.name());
                 //扣减余额到冻结金额
                 this.reduceWithdrawal(price, authUser.getId(), "提现金额已冻结，审核成功后到账", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
             }
+            //发送余额提现申请消息
+
+            memberWithdrawalMessage.setMemberId(authUser.getId());
+            memberWithdrawalMessage.setPrice(price);
+            memberWithdrawalMessage.setDestination(MemberWithdrawalDestinationEnum.WECHAT.name());
+            String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_WITHDRAWAL.name();
+            rocketMQTemplate.asyncSend(destination, memberWithdrawalMessage, RocketmqSendCallbackBuilder.commonCallback());
         }
         return memberWithdrawApplyService.save(memberWithdrawApply);
     }
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
index 7faba804..425c1401 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java
@@ -3,7 +3,9 @@ package cn.lili.modules.member.serviceimpl;
 
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.common.utils.DateUtil;
+import cn.lili.common.properties.RocketmqCustomProperties;
+import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage;
+import cn.lili.modules.member.entity.enums.MemberWithdrawalDestinationEnum;
 import cn.lili.mybatis.util.PageUtil;
 import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
@@ -15,9 +17,12 @@ import cn.lili.modules.member.mapper.MemberWithdrawApplyMapper;
 import cn.lili.modules.member.service.MemberWalletService;
 import cn.lili.modules.member.service.MemberWithdrawApplyService;
 import cn.lili.modules.order.trade.entity.enums.DepositServiceTypeEnum;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.MemberTagsEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +40,11 @@ import java.util.Date;
 @Transactional(rollbackFor = Exception.class)
 public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawApplyMapper, MemberWithdrawApply> implements MemberWithdrawApplyService {
 
+    @Autowired
+    private RocketMQTemplate rocketMQTemplate;
+    @Autowired
+    private RocketmqCustomProperties rocketmqCustomProperties;
+
     /**
      * 会员余额
      */
@@ -43,12 +53,13 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
 
     @Override
     public Boolean audit(String applyId, Boolean result, String remark) {
+        MemberWithdrawalMessage memberWithdrawalMessage = new MemberWithdrawalMessage();
         //查询申请记录
         MemberWithdrawApply memberWithdrawApply = this.getById(applyId);
         memberWithdrawApply.setInspectRemark(remark);
         memberWithdrawApply.setInspectTime(new Date());
         if (memberWithdrawApply != null) {
-           //获取账户余额
+            //获取账户余额
             MemberWalletVO memberWalletVO = memberWalletService.getMemberWallet(memberWithdrawApply.getMemberId());
             //校验金额是否满足提现，因为是从冻结金额扣减，所以校验的是冻结金额
             if (memberWalletVO.getMemberFrozenWallet() < memberWithdrawApply.getApplyMoney()) {
@@ -60,13 +71,17 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
                 //提现，微信提现成功后扣减冻结金额
                 Boolean bool = memberWalletService.withdrawal(memberWithdrawApply);
                 if (bool) {
+                    memberWithdrawalMessage.setStatus(WithdrawStatusEnum.VIA_AUDITING.name());
                     //保存修改审核记录
                     this.updateById(memberWithdrawApply);
                     //记录日志
                     memberWalletService.reduceFrozen(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核通过，余额提现", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
-                    return true;
+                } else {
+                    //如果提现失败则无法审核
+                    throw new ServiceException(ResultCode.WALLET_APPLY_ERROR);
                 }
             } else {
+                memberWithdrawalMessage.setStatus(WithdrawStatusEnum.FAIL_AUDITING.name());
                 //如果审核拒绝 审核备注必填
                 if (StringUtils.isEmpty(remark)) {
                     throw new ServiceException(ResultCode.WALLET_REMARK_ERROR);
@@ -76,8 +91,15 @@ public class MemberWithdrawApplyServiceImpl extends ServiceImpl<MemberWithdrawAp
                 this.updateById(memberWithdrawApply);
                 //需要从冻结金额扣减到余额
                 memberWalletService.increaseWithdrawal(memberWithdrawApply.getApplyMoney(), memberWithdrawApply.getMemberId(), "审核拒绝，提现金额解冻到余额", DepositServiceTypeEnum.WALLET_WITHDRAWAL.name());
-                return true;
             }
+            //发送审核消息
+            memberWithdrawalMessage.setMemberId(memberWithdrawApply.getMemberId());
+            memberWithdrawalMessage.setPrice(memberWithdrawApply.getApplyMoney());
+            memberWithdrawalMessage.setDestination(MemberWithdrawalDestinationEnum.WECHAT.name());
+
+            String destination = rocketmqCustomProperties.getMemberTopic() + ":" + MemberTagsEnum.MEMBER_WITHDRAWAL.name();
+            rocketMQTemplate.asyncSend(destination, memberWithdrawalMessage, RocketmqSendCallbackBuilder.commonCallback());
+            return true;
         }
         throw new ServiceException(ResultCode.WALLET_APPLY_ERROR);
     }
diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java
index 979f39fa..34673666 100644
--- a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java
+++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java
@@ -49,7 +49,8 @@ public enum NoticeMessageNodeEnum {
      */
     WALLET_CHANGE("余额账户变更通知"),
     WALLET_WITHDRAWAL_CREATE("提现申请提交成功通知"),
-    WALLET_WITHDRAWAL_SUCCESS("提现成功通知"),
+    WALLET_WITHDRAWAL_SUCCESS("余额提现成功通知"),
+    WALLET_WITHDRAWAL_WEICHAT_SUCCESS("微信提现成功通知"),
     WALLET_WITHDRAWAL_ERROR("提现申请驳回通知");
 
 
diff --git a/update-sql/li_notice_message.sql b/update-sql/li_notice_message.sql
index 876eeb4e..bafd8a04 100644
--- a/update-sql/li_notice_message.sql
+++ b/update-sql/li_notice_message.sql
@@ -11,7 +11,7 @@
  Target Server Version : 80023
  File Encoding         : 65001
 
- Date: 21/07/2021 19:26:53
+ Date: 27/07/2021 19:42:15
 */
 
 SET NAMES utf8mb4;
@@ -57,9 +57,10 @@ INSERT INTO `li_notice_message` VALUES (14, NULL, '2021-07-15 19:39:39.000000',
 INSERT INTO `li_notice_message` VALUES (15, NULL, '2021-07-15 19:44:38.000000', NULL, NULL, '2021-07-15 19:44:40.000000', '售后单 #{商品名称} 已经完成，请关注及时关注售后单状态~', '售后完成通知', 'OPEN', '售后完成通知', 'goods');
 INSERT INTO `li_notice_message` VALUES (16, NULL, '2021-07-15 19:47:27.000000', NULL, NULL, '2021-07-15 19:47:31.000000', '您当前到账{获得积分}积分，消费#{消费积分} 积分，积分可以抵现金哦，真的很棒棒呢~', '积分变更通知', 'OPEN', '积分变更通知', 'income_points,expenditure_points');
 INSERT INTO `li_notice_message` VALUES (17, NULL, '2021-07-15 19:53:10.000000', NULL, NULL, '2021-07-15 19:53:13.000000', '您的余额账户今日收入¥#{收入金额}，支出¥#{支出金额}，如遇异常变动，请及时联系我们哦~', '余额账户变更通知', 'OPEN', '余额账户变更通知', 'income,expenditure');
-INSERT INTO `li_notice_message` VALUES (18, NULL, '2021-07-15 19:57:01.000000', NULL, NULL, '2021-07-15 19:57:04.000000', '恭喜您，您的提处理成功，提现金额为¥#{收入金额}，将在1-3工作日内到账', '提现成功通知', 'OPEN', '提现成功通知', 'income');
+INSERT INTO `li_notice_message` VALUES (18, NULL, '2021-07-15 19:57:01.000000', NULL, NULL, '2021-07-15 19:57:04.000000', '恭喜您，您的提处理成功，提现金额为¥#{收入金额}，请及时关注余额变动哦~', '余额提现成功通知', 'OPEN', '余额提现成功通知', 'income');
 INSERT INTO `li_notice_message` VALUES (19, NULL, '2021-07-21 18:58:10.000000', NULL, NULL, '2021-07-21 18:58:13.000000', '恭喜您，您的提现金额为¥#{金额}的申请已经提交审核，请及时关注审核动态哦~', '提现申请提交成功通知', 'OPEN', '提现申请提交成功通知', 'price');
 INSERT INTO `li_notice_message` VALUES (20, NULL, '2021-07-21 19:16:58.000000', NULL, NULL, '2021-07-21 19:17:02.000000', '很抱歉，您的提现金额为¥#{金额}的申请已被拒绝，如有问题请及时联系管理员哦~', '提现申请驳回通知', 'OPEN', '提现申请驳回通知', 'price');
+INSERT INTO `li_notice_message` VALUES (21, NULL, '2021-07-26 18:59:00.000000', NULL, NULL, '2021-07-26 18:59:03.000000', '恭喜您，您的提处理成功，提现金额为¥#{收入金额}，将在1-3个工作日内到账~', '微信提现成功通知', 'OPEN', '微信提现成功通知', 'income');
 COMMIT;
 
 SET FOREIGN_KEY_CHECKS = 1;