From 92e743cb8f66c15c34bce0a7c2eda54d1f889204 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Fri, 26 Jul 2024 16:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=20=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E5=90=8D=E7=A7=B0=20=E4=BF=AE=E6=94=B9=E6=97=B6=20?=
 =?UTF-8?q?=E8=AF=A5=E5=BA=97=E9=93=BA=E7=9A=84=20Master=E5=91=98=E5=B7=A5?=
 =?UTF-8?q?=20=E5=90=8D=E7=A7=B0=E4=B8=80=E5=BE=8B=E4=B8=BA=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashier/repository/shop/TbPlussShopStaffRepository.java | 6 ++++++
 .../service/impl/shopimpl/TbShopInfoServiceImpl.java        | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java
index 8675952b..b7d4a6a5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/shop/TbPlussShopStaffRepository.java
@@ -21,6 +21,8 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
+import java.util.List;
+
 /**
 * @website https://eladmin.vip
 * @author lyf
@@ -42,4 +44,8 @@ public interface TbPlussShopStaffRepository extends JpaRepository<TbPlussShopSta
 
     @Query("select staff from TbPlussShopStaff as staff  where staff.account = :account")
     TbPlussShopStaff queryByAccount(String account);
+
+    @Modifying
+    @Query("update TbPlussShopStaff set name=:name where shopId = :shopId and type='master'")
+    void updateNameById(String name, String shopId);
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
index 25e25028..59f2e184 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
@@ -203,6 +203,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
         TbPlussShopStaff tbPlussShopStaff = new TbPlussShopStaff();
         tbPlussShopStaff.setShopId(String.valueOf(save.getId()));
         tbPlussShopStaff.setType("master");
+        tbPlussShopStaff.setName(resources.getShopName());
         tbPlussShopStaff.setAccount(resources.getAccount());
         tbPlussShopStaff.setPassword(MD5Utils.encrypt(resources.getPassword()));
         tbPlussShopStaff.setStatus(1);
@@ -237,6 +238,9 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
     @Transactional(rollbackFor = Exception.class)
     public void update(TbShopInfo resources) {
         TbShopInfo tbShopInfo = tbShopInfoRepository.findById(resources.getId()).orElseGet(TbShopInfo::new);
+        if (!resources.getShopName().equals(tbShopInfo.getShopName())) {
+            shopStaffRepository.updateNameById(resources.getShopName(),resources.getId().toString());
+        }
         ValidationUtil.isNull( tbShopInfo.getId(),"TbShopInfo","id",resources.getId());
         tbShopInfo.copy(resources);
         tbShopInfo.setUpdatedAt(Instant.now().toEpochMilli());