From 2e9d7065dc4c7801af901946220bc0988d26f21d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 01 四月 2024 10:10:48 +0800
Subject: [PATCH] 修改西区uu洗车登录接口500  2

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 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 d30c703..9135199 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
@@ -802,12 +802,14 @@
      * @return 人员详情
      */
     @Override
-    public R<LoginUserInfoVO> detailUser(Long userId) {
+    public R<LoginUserInfoVO> detailUser(Long userId)
+    {
         LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
         SysUserDO sysUserDO = userDao.selectById(userId);
         if (ObjectUtils.isEmpty(sysUserDO)) {
             return R.fail("人员不存在");
         }
+
         BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
         List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
                 .selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
@@ -898,8 +900,10 @@
 
         SysUserRoleDO sysUserRoleDO=sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>()
                 .lambda().eq(SysUserRoleDO::getUserId,sysUserDO.getUserId()));
-        loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId().toString());
-
+        if(sysUserRoleDO!=null && sysUserRoleDO.getRoleId()!=null )
+        {
+            loginUserInfoVO.setRoleId(sysUserRoleDO.getRoleId()+"");
+        }
         return R.ok(loginUserInfoVO);
     }
 
@@ -3487,12 +3491,42 @@
         }
         Map<String, String> headerMap = new HashMap<>();
         headerMap.put("appid", appId);
-        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);
+
+        String str="";
+        if(!StringUtils.isEmpty(uuLoginVO.getProvince()))
+        {
+            str=str+"&province=" + uuLoginVO.getProvince();
+        }
+
+
+        if(!StringUtils.isEmpty(uuLoginVO.getCity()))
+        {
+            str=str+"&city=" + uuLoginVO.getCity();
+        }
+
+        if(!StringUtils.isEmpty(uuLoginVO.getArea()))
+        {
+            str=str+"&area=" + uuLoginVO.getArea();
+        }
+
+        if(!StringUtils.isEmpty(uuLoginVO.getCouponId()))
+        {
+            str=str+"&couponId=" + uuLoginVO.getCouponId();
+        }
+
+//        String resultJson = HttpClientUtil.get("https://uu-api.imashuo.com/member/wx/get-acces.s?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?" +
+                "appid=" + appId +
+                "&timestamp=" + uuLoginVO.getTimestamp() +
+                "&sign=" + uuLoginVO.getSign() +
+                "&mobile=" + uuLoginVO.getMobile() +
+                        str  ,
+                headerMap, null);
         JSONObject result = JSON.parseObject(resultJson);
         if (result.get("status").equals(1)) {
-            return R.ok(result.get("data"));
+            return R.ok(result.get("data")+"   "+resultJson);
         }
-        return R.fail("信息错误");
+        return R.fail("信息错误"+"   "+resultJson);
     }
 
     @Override

--
Gitblit v1.7.1