From aef647ad1554f8aa1788e4b5cd03ce383c4d3449 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 17:04:00 +0800
Subject: [PATCH] #feat ,,

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 26905f7..e837558 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -122,10 +122,10 @@
         String mobilePhone = convenientMerchantDTO.getMobilePhone();
         ConvenientMerchantDO merchantDO = this.baseMapper.selectOne(new LambdaQueryWrapper<ConvenientMerchantDO>().eq(ConvenientMerchantDO::getMobilePhone, mobilePhone));
         ConvenientMerchantDO convenientMerchantDO = this.baseMapper.selectById(merchantId);
-        BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
         if (isNull(convenientMerchantDO)) {
             return R.fail("商家不存在");
         }
+        BeanUtils.copyProperties(convenientMerchantDTO, convenientMerchantDO);
         if (nonNull(merchantDO) && !merchantDO.getId().equals(convenientMerchantDO.getId())) {
             R.fail("该微信手机号:" + mobilePhone + "已被使用!请更换");
         }

--
Gitblit v1.7.1