From 9eb00a96c64fabfe1a17d49844602736456762fa Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期四, 06 一月 2022 16:28:17 +0800
Subject: [PATCH] 商业街商家后台登录&支付完成处理

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 64811e1..1ac82ba 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
@@ -2832,9 +2832,17 @@
             return R.ok(sysUserDO.getUserId());
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("新增后台用户报错【{}】", e.getMessage());
+            log.error("修改数字商业街商家用户报错【{}】", e.getMessage());
+            if (e.getMessage().contains("union_phone_type")) {
+                return R.fail("手机号已存在");
+            } else if (e.getMessage().contains("union_account_type")) {
+                return R.fail("账户已经存在");
+            }else if(e.getMessage().contains("23000")){
+                return R.fail("手机号已存在");
+            } else {
+                return R.fail("账户或手机号已存在,请重新填写尝试");
+            }
         }
-        return R.fail("新增商户发生错误");
     }
 
     /**
@@ -2877,4 +2885,19 @@
         }
         return R.ok();
     }
+
+    /**
+     * 检查用户是否有效
+     * @param userId
+     * @param type
+     * @return
+     */
+    @Override
+    public Boolean checkUserIsValid(Long userId, Integer type) {
+        SysUserDO sysUserDO = userDao.selectById(userId);
+        if (isNull(sysUserDO) || sysUserDO.getStatus() != 1 || !sysUserDO.getType().equals(type)) {
+            return false;
+        }
+        return true;
+    }
 }

--
Gitblit v1.7.1