From 78ab8a882cb5e9d1c09927abdddd4a4b2e27f359 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 十一月 2022 13:41:44 +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 | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 1264b4a..2f1fbf0 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
@@ -886,6 +886,14 @@
if (sysUserDO.getBindingCheckUnitId() != null) {
loginUserInfoVO.setBackstageType(4);
}
+ //判断是否是商家账号
+ Long storeId = userDao.selectStoreIdIdByUserId(sysUserDO.getUserId());
+ if (null != storeId){
+ loginUserInfoVO.setBackstageUserId(sysUserDO.getUserId());
+ loginUserInfoVO.setBackstageType(5);
+ loginUserInfoVO.setStoreIdId(storeId);
+ }
+
return R.ok(loginUserInfoVO);
}
@@ -3777,7 +3785,7 @@
Iterator<StreetVOStr> iterator = streetVOS.listIterator();
while (iterator.hasNext()) {
StreetVOStr vo = iterator.next();
- List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
+ List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(Long.parseLong(vo.getId()), 3);
vo.setChildList(communityVOS);
}
--
Gitblit v1.7.1