From 737fcdc8417eaed4a3c60978e0c5ad4c2fda5802 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 6 Jan 2025 13:25:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BD=93=E7=8E=B0=E6=8A=A5=E9=94=99=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/service/impl/CashOutServiceImpl.java  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
index 46ab05c7..f2e15f08 100644
--- a/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
+++ b/src/main/java/com/sqx/modules/pay/service/impl/CashOutServiceImpl.java
@@ -623,12 +623,8 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
             queryWrapper.le(CashOut::getCreateAt, cashOut.getEndTime());
         }
 
-        List<CashOut> page;
-        if (queryWrapper.isEmptyOfWhere()) {
-            page = list();
-        }else {
-            page = list(queryWrapper);
-        }
+        queryWrapper.orderByDesc(CashOut::getId);
+        List<CashOut> page = list(queryWrapper);
 
         if (!page.isEmpty()) {
             Set<Long> userIdList = page.stream().map(CashOut::getUserId).collect(Collectors.toSet());
@@ -651,7 +647,6 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void audit(CashOut cashOut) {
-        long id = cashOut.getId();
         Integer isAgree = cashOut.getIsAgree();
         if (isAgree == null) {
             throw new SqxException("请选择同意或者拒绝！");
@@ -659,7 +654,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
         if (isAgree == 0 && StrUtil.isBlank(cashOut.getRefund())) {
             throw new SqxException("请输入拒绝原因！");
         }
-        CashOut entity = baseMapper.selectById(id);
+        CashOut entity = baseMapper.selectOne(new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, cashOut.getUserId()).eq(CashOut::getId, cashOut.getId()));
         if (entity == null) {
             throw new SqxException("提现申请不存在！");
         }
@@ -692,7 +687,7 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
             return;
         }
         entity.setState(4);
-        baseMapper.updateById(entity);
+        baseMapper.update(entity, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, entity.getUserId()).eq(CashOut::getId, entity.getId()));
         if (StrUtil.isBlank(entity.getOrderNumber())) {
             String outOrderNo = AliPayOrderUtil.createOrderId();
             entity.setOrderNumber(outOrderNo);
@@ -714,11 +709,18 @@ public class CashOutServiceImpl extends ServiceImpl<CashOutDao, CashOut> impleme
             entity.setRefund("提现失败,请检查支付宝账号与收款人姓名后,重试。");
             backCashAmount(entity);
         }
-        baseMapper.updateById(entity);
+        updateByUserId(entity);
+    }
+
+    public void updateByUserId(CashOut entity) {
+        if (entity.getUserId() == null) {
+            throw new SqxException("cashOut修改失败: userId必须传递");
+        }
+        baseMapper.update(entity, new LambdaQueryWrapper<CashOut>().eq(CashOut::getUserId, entity.getUserId()).eq(CashOut::getId, entity.getId()));
     }
 
     private void backCashAmount(CashOut entity) {
-        baseMapper.updateById(entity);
+        updateByUserId(entity);
         UserMoneyDetails userMoneyDetails = new UserMoneyDetails(
                 entity.getUserId(), entity.getSysUserId(), null, "[提现退款]", 4, 1, 2,
                 new BigDecimal(entity.getMoney()), "提现失败，自动退款" + entity.getMoney() + "元", 1, entity.getId());