From 5c0bd22b406daddb858f1ac6688182a8b26a9442 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 30 六月 2023 13:07:17 +0800
Subject: [PATCH] 区分西区  花城分类

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 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 eda1ddf..aa368ba 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,18 @@
         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);
+        }
+
+        SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
+                .lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
+        loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId().toString());
+
         return R.ok(loginUserInfoVO);
     }
 
@@ -3408,7 +3420,7 @@
         }
         Map<String, String> headerMap = new HashMap<>();
         headerMap.put("appid", appId);
-        String resultJson = HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "&timestamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
+        String resultJson = HttpClientUtil.get("https://uu-api.imashuo.com/member/wx/get-access?province=" + uuLoginVO.getProvince() + "&city=" + uuLoginVO.getCity() + "&area=" + uuLoginVO.getArea() + "&appid=" + appId + "&timestamp=" + uuLoginVO.getTimestamp() + "&sign=" + uuLoginVO.getSign() + "&mobile=" + uuLoginVO.getMobile() + "&couponId=" + uuLoginVO.getCouponId(), headerMap, null);
         JSONObject result = JSON.parseObject(resultJson);
         if (result.get("status").equals(1)) {
             return R.ok(result.get("data"));
@@ -3768,16 +3780,16 @@
     @Override
     public R getAllCommunityList() {
         List<Integer> areaList = areaCodeList();
-        List<AreaVOS> areaVOList = new ArrayList<>();
+        List<AreaVOStr> areaVOList = new ArrayList<>();
         for (Integer code : areaList) {
-            AreaVOS areaVO = new AreaVOS();
-            areaVO.setId(code);
+            AreaVOStr areaVO = new AreaVOStr();
+            areaVO.setId(code+"");
             areaVO.setName(areaCodeToName(code.longValue()));
-            List<StreetVOS> streetVOS = userDao.selectStreetByAreaCode(code);
-            Iterator<StreetVOS> iterator = streetVOS.listIterator();
+            List<StreetVOStr> streetVOS = userDao.selectStreetByAreaCodeStr(code);
+            Iterator<StreetVOStr> iterator = streetVOS.listIterator();
             while (iterator.hasNext()) {
-                StreetVOS vo = iterator.next();
-                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(vo.getId(), 3);
+                StreetVOStr vo = iterator.next();
+                List<CommunityVO> communityVOS = userDao.selectCommunityByStreetId(Long.parseLong(vo.getId()), 3);
                 vo.setChildList(communityVOS);
 
             }

--
Gitblit v1.7.1