From 2fcf3c67e95c1b7c82a1c8ba1cf308ffed0a47b1 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 26 四月 2021 14:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 1aca3cb..a517c5b 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
@@ -1652,12 +1652,12 @@
if (e.getMessage().contains("union_phone_type")) {
userDao.deleteStoreByPhoneAndStatus(storeVO.getPhone());
roleDAO.deleteByRoleKey(Constants.SHOP_ROLE_KEY + storeVO.getStoreAccount());
- throw new ServiceException("手机号已经存在");
+ return R.fail("手机号已经存在");
} else if (e.getMessage().contains("union_account_type")) {
- throw new ServiceException("账户已经存在");
+ return R.fail("账户已经存在");
}
}
- return R.fail();
+ return R.ok();
}
/**
--
Gitblit v1.7.1