From 94c34f08015c3f5f4d839354958aea88b31473a0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 11:13:07 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 8f796ac..f3de5d6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -2869,12 +2869,8 @@
         } catch (Exception e) {
             e.printStackTrace();
             log.error("修改数字商业街商家用户报错【{}】", e.getMessage());
-            if (e.getMessage().contains("union_phone_type")) {
-                return R.fail("手机号已存在");
-            } else if (e.getMessage().contains("union_account_type")) {
+            if (e.getMessage().contains("union_account_type") || e.getMessage().contains("23000")) {
                 return R.fail("账户已经存在");
-            }else if(e.getMessage().contains("23000")){
-                return R.fail("手机号已存在");
             } else {
                 return R.fail("账户或手机号已存在,请重新填写尝试");
             }

--
Gitblit v1.7.1