From c0eee46be98ba6c3483136ca39d712979bc5125a Mon Sep 17 00:00:00 2001
From: taozi <9108791@qq.com>
Date: Sat, 26 Feb 2022 16:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E5=A4=B1=E8=B4=A5=E4=BD=A3?=
 =?UTF-8?q?=E9=87=91=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/YxUserExtractServiceImpl.java        | 27 ++++++++++---------
 .../modules/mp/listener/TemplateListener.java | 22 ++++++++-------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java
index 6a785fd9..32348801 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java
@@ -31,10 +31,7 @@ import co.yixiang.modules.activity.service.mapper.YxUserExtractMapper;
 import co.yixiang.modules.user.domain.YxUser;
 import co.yixiang.modules.user.service.YxUserBillService;
 import co.yixiang.modules.user.service.YxUserService;
-import co.yixiang.modules.user.service.dto.WechatUserDto;
-import co.yixiang.modules.user.service.dto.YxWechatUserDto;
 import co.yixiang.utils.FileUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import lombok.AllArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
@@ -219,19 +216,23 @@ public class YxUserExtractServiceImpl extends BaseServiceImpl<YxUserExtractMappe
             if(StrUtil.isEmpty(resources.getFailMsg())){
                 throw new BadRequestException("请填写失败原因");
             }
-            String mark = "提现失败,退回佣金"+resources.getExtractPrice()+"元";
-            YxUser yxUser = userService.getById(resources.getUid());
+            //防止无限添加佣金
+            if (ObjectUtil.isNull(userExtract.getFailTime())) {
+                String mark = "提现失败,退回佣金"+resources.getExtractPrice()+"元";
+                YxUser yxUser = userService.getById(resources.getUid());
 
-            double balance = NumberUtil.add(yxUser.getBrokeragePrice(),resources.getExtractPrice()).doubleValue();
-            //插入流水
-            billService.income(resources.getUid(),"提现失败", BillDetailEnum.CATEGORY_1.getValue(),
-                    BillDetailEnum.TYPE_4.getValue(),resources.getExtractPrice().doubleValue(),balance,
-                    mark,resources.getId().toString());
+                double balance = NumberUtil.add(yxUser.getBrokeragePrice(),resources.getExtractPrice()).doubleValue();
+                //插入流水
+                billService.income(resources.getUid(),"提现失败", BillDetailEnum.CATEGORY_1.getValue(),
+                        BillDetailEnum.TYPE_4.getValue(),resources.getExtractPrice().doubleValue(),balance,
+                        mark,resources.getId().toString());
 
-            //返回提现金额
-            userService.incBrokeragePrice(resources.getExtractPrice(),resources.getUid());
+                //返回提现金额
+                userService.incBrokeragePrice(resources.getExtractPrice(),resources.getUid());
+
+                resources.setFailTime(new Date());
+            }
 
-            resources.setFailTime(new Date());
         }else{
             //模板消息支付成功发布事件
             TemplateBean templateBean = TemplateBean.builder()
diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/listener/TemplateListener.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/listener/TemplateListener.java
index fd0a27eb..1edc6570 100644
--- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/listener/TemplateListener.java
+++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/listener/TemplateListener.java
@@ -143,15 +143,19 @@ public class TemplateListener implements SmartApplicationListener {
                     }
                 }
                 if (!success) {
-                    String mark = "提现失败,退回佣金" + resources.getExtractPrice() + "元";
-                    double balance = NumberUtil.add(user.getBrokeragePrice(), resources.getExtractPrice()).doubleValue();
-                    //插入流水
-                    billService.income(resources.getUid(), "提现失败", BillDetailEnum.CATEGORY_1.getValue(),
-                            BillDetailEnum.TYPE_4.getValue(), resources.getExtractPrice().doubleValue(), balance,
-                            mark, resources.getId().toString());
-                    //返回提现金额
-                    userService.incBrokeragePrice(resources.getExtractPrice(), resources.getUid());
-                    resources.setFailTime(new Date());
+                    //防止无限添加佣金
+                    if (ObjectUtil.isNull(resources.getFailTime())) {
+                        String mark = "提现失败,退回佣金" + resources.getExtractPrice() + "元";
+                        double balance = NumberUtil.add(user.getBrokeragePrice(), resources.getExtractPrice()).doubleValue();
+                        //插入流水
+                        billService.income(resources.getUid(), "提现失败", BillDetailEnum.CATEGORY_1.getValue(),
+                                BillDetailEnum.TYPE_4.getValue(), resources.getExtractPrice().doubleValue(), balance,
+                                mark, resources.getId().toString());
+                        //返回提现金额
+                        userService.incBrokeragePrice(resources.getExtractPrice(), resources.getUid());
+                        resources.setFailMsg("提现失败");
+                        resources.setFailTime(new Date());
+                    }
                     yxUserExtractService.updateById(resources);
                 }