From 55402cc48ecee2ac135624db4d31119b459a1be7 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期五, 14 一月 2022 15:59:51 +0800
Subject: [PATCH] 商业街bug修改

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
index 0935a9e..3d20c0a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsMerchantServiceImpl.java
@@ -80,6 +80,14 @@
     @Override
     @Transactional(rollbackFor = Exception.class)
     public R addMcsMerchant(McsMerchantDTO mcsMerchantDTO) {
+        McsMerchant existMerchant = this.baseMapper.selectOne(new QueryWrapper<McsMerchant>().lambda().eq(McsMerchant::getPhone, mcsMerchantDTO.getPhone()));
+        if (nonNull(existMerchant)) {
+            if (existMerchant.getIsDel()) {
+                this.baseMapper.deleteById(existMerchant.getId());
+            } else {
+                return R.fail("手机号已存在");
+            }
+        }
         McsMerchant mcsMerchant = new McsMerchant();
         BeanUtils.copyProperties(mcsMerchantDTO, mcsMerchant);
         Integer litDays = mcsMerchantDTO.getLitDays();

--
Gitblit v1.7.1