From 56e2dc02ca5f4cf38308f8a1389322639f89e99e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 16:01:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 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 198282f..fca3336 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
@@ -331,6 +331,14 @@
             return R.fail();
         }
         LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
+        //获取后台商家user
+        SysUserDO sysUser = userDao.selectOne(
+                new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, appId));
+        //判断是否是商家账号
+        if (nonNull(sysUser)){
+            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
+            loginUserInfoVO.setBackstageType(5);
+        }
         if (nonNull(sysUserDO.getStreetId())){
             loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
         }
@@ -532,6 +540,14 @@
                 loginUserInfoVO.setIsDpcMember(1);
             }
         }
+        //获取后台商家user
+        SysUserDO sysUser = userDao.selectOne(
+                new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getType, 5).eq(SysUserDO::getPhone, sysUserDO.getPhone()).eq(SysUserDO::getAppId, "wx118de8a734d269f0"));
+        //判断是否是商家账号
+        if (nonNull(sysUser)){
+            loginUserInfoVO.setBackstageUserId(sysUser.getUserId());
+            loginUserInfoVO.setBackstageType(5);
+        }
         //是否为物业公司账号
         if (nonNull(sysUserDO.getPhone())){
             Long propertyAccount = userDao.isPropertyAccount(sysUserDO.getPhone());

--
Gitblit v1.7.1