From c1c2ccd0d8b716bd75784afc3c4a4c549f54b417 Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Fri, 30 Jan 2026 15:01:43 +0800
Subject: [PATCH] =?UTF-8?q?update=202miner=20=E4=B8=93=E7=94=A8=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E5=92=8C=E6=89=8B=E7=BB=AD=E8=B4=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LeaseShopServiceImpl.java    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
index f6dbd91..c431a08 100644
--- a/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
+++ b/src/main/java/com/m2pool/lease/service/impl/LeaseShopServiceImpl.java
@@ -134,6 +134,11 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
             return Result.fail("谷歌验证码错误");
         }
 
+        LeaseShop byId = getById(shopVo.getId());
+        if (byId.getDel()){
+            return Result.fail("修改失败,店铺已被删除");
+        }
+
         LeaseShop leaseShop = LeaseShop.builder()
                 .id(shopVo.getId())
                 .userEmail(SecurityUtils.getUsername())
@@ -141,19 +146,14 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
                 .image(shopVo.getImage())
                 .description(shopVo.getDescription())
                 .state(shopVo.getState())
-                .feeRate(shopVo.getFeeRate())
                 .authId(SecurityUtils.getUserId())
+                .feeRate(shopVo.getFeeRate())
                 .isOpen(shopVo.getIsOpen())
                 .build();
-        LeaseShop byId = getById(shopVo.getId());
-        if (byId.getDel()){
-            return Result.fail("修改失败,店铺已被删除");
-        }
-        if (shopVo.getIsOpen() != null && !byId.getIsOpen().equals(shopVo.getIsOpen())){
+
+        if (byId.getIsOpen() != shopVo.getIsOpen()){
             if (shopVo.getIsOpen()){
-                leaseShop.setFeeRate(leaseShop.getFeeRate().add(BigDecimal.valueOf(0.02)));
-            }else{
-                leaseShop.setFeeRate(leaseShop.getFeeRate().subtract(BigDecimal.valueOf(0.02)));
+                leaseShop.setFeeRate(shopVo.getFeeRate().add(BigDecimal.valueOf(0.02)));
             }
         }
 
@@ -204,6 +204,7 @@ public class LeaseShopServiceImpl extends ServiceImpl<LeaseShopMapper, LeaseShop
                     .description(leaseShop.getDescription())
                     .state(leaseShop.getState())
                     .isOpen(leaseShop.getIsOpen())
+                    .feeRate(leaseShop.getFeeRate())
                     .networkFee(BigDecimal.ZERO)
                     .del(leaseShop.getDel())
                     .build();