From 8b099a2ae663f97fb95c7e059ba35b6eb43d17ee Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 12 Sep 2024 10:26:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java   | 5 ++---
 .../cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
index 103fc7bb..fdc8c28b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
@@ -57,8 +57,7 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "商户Id")
     private String merchantId;
 
-    @Column(name = "`shop_name`",nullable = false)
-    @NotBlank
+    @Column(name = "`shop_name`")
     @ApiModelProperty(value = "店铺名称")
     private String shopName;
 
@@ -282,6 +281,6 @@ public class TbShopInfo implements Serializable {
     private String paymentQrcode;
 
     public void copy(TbShopInfo source){
-        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
 }
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 0fad205e..96200030 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
@@ -239,7 +239,7 @@ 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())) {
+        if (StringUtils.isNotBlank(resources.getShopName()) && !resources.getShopName().equals(tbShopInfo.getShopName())) {
             shopStaffRepository.updateNameById(resources.getShopName(),resources.getId().toString());
             userRepository.updateNickName(resources.getAccount(),resources.getShopName());
         }

From baa9c6c2608bb010be8cea5278541dc7b46f49f6 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 12 Sep 2024 10:31:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98=20=E9=9D=9E=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
index fdc8c28b..3cb60517 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
@@ -189,8 +189,7 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "到期时间")
     private Long expireAt;
 
-    @Column(name = "`status`",nullable = false)
-    @NotNull
+    @Column(name = "`status`")
     @ApiModelProperty(value = "门店状态")
     private Integer status;