From 2e7f787f8e0859d0a9a6ff1eab6aeadac7934c50 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 25 九月 2023 12:55:18 +0800
Subject: [PATCH] bug

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index bac11cf..d2f60f6 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -226,7 +226,6 @@
             shopRelTagService.deleteByShopId(shop.getShopId());
             shopRelUserService.deleteByShopId(shop.getShopId());
             //清空归属
-            shopRelUserService.deleteByShopId(shop.getShopId());
             shopStaffService.clearShopStaffRelation(shop.getShopId());
             if(!shop.getShopName().equals(mgtEditShopDto.getShopName())){
                 MgtMemberShopNameDto mgtMemberShopNameDto = new MgtMemberShopNameDto();
@@ -376,7 +375,8 @@
         shopProportion.setDelFlag(0);
         shopProportion.setShopId(shop.getShopId());
         shopProportion.setShopType(shop.getShopType());
-        BigDecimal proportionPercent = redisService.getCacheObject(SecurityConstant.SHOP_COMMON_PROPORTION);
+        String proportionPercentStr = redisService.getCacheObject(SecurityConstant.SHOP_COMMON_PROPORTION);
+        BigDecimal proportionPercent = new BigDecimal(proportionPercentStr);
         if(proportionPercent==null){
             proportionPercent = new BigDecimal("30");
         }
@@ -716,7 +716,6 @@
             shopTransferRecord.setAfterUserId(mgtTransferShopDto.getTransferUserId());
             shopTransferRecord.setTransferRemark(mgtTransferShopDto.getTransferRemark());
             shopTransferRecordService.save(shopTransferRecord);
-            shopRelUserService.deleteByUserId(shop.getBelongUserId());
         }
         shop.setBelongUserId(mgtTransferShopDto.getTransferUserId());
         this.saveOrUpdate(shop);

--
Gitblit v1.7.1