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

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   51 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 43 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 23894d3..eb305e4 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
@@ -900,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,14 +3489,47 @@
         } catch (Exception e) {
             e.printStackTrace();
         }
-        Map<String, String> headerMap = new HashMap<>();
+        Map<String, Object> 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);
-        JSONObject result = JSON.parseObject(resultJson);
-        if (result.get("status").equals(1)) {
-            return R.ok(result.get("data"));
+
+        String str="https://uu-api.imashuo.com/member/wx/get-access?"+ "appid=" + appId +
+                "&timestamp=" + uuLoginVO.getTimestamp() +
+                "&sign=" + uuLoginVO.getSign() +
+                "&mobile=" + uuLoginVO.getMobile();
+
+        if(!StringUtils.isEmpty(uuLoginVO.getProvince()))
+        {
+            str=str+"&province=" + uuLoginVO.getProvince();
         }
-        return R.fail("信息错误");
+
+
+        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 = null;
+        try {
+            resultJson = HttpClientUtil.httpGet(str  ,headerMap,10000 ,null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        JSONObject result = JSON.parseObject(resultJson);
+//        if (result.get("status").equals(1)) {
+//            return R.ok(result.get("data")+"   "+resultJson);
+//        }
+        return R.fail("信息错误"+"   "+resultJson);
     }
 
     @Override

--
Gitblit v1.7.1