From cc595b0aa24773735417accd0158da6ac98a6db0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 30 六月 2022 14:47:56 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 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 9fd8ca5..a86685c 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
@@ -250,17 +250,20 @@
      */
     @Override
     public R updateUserWeiXinPhone(Long userId, String purePhoneNumber) {
-        SysUserDO sysUserDO = new SysUserDO();
-        sysUserDO.setPhone(purePhoneNumber);
-        sysUserDO.setUserId(userId);
-        userDao.updateMemberRole(purePhoneNumber, purePhoneNumber);
-        userDao.updateServiceTeam(purePhoneNumber, purePhoneNumber);
-        int i = userDao.updateById(sysUserDO);
-        if (i > 0) {
-            return R.ok(purePhoneNumber);
-        } else {
-            return R.fail("维护微信手机号失败");
+        SysUserDO sysUserDO=userDao.selectById(userId);
+        if(sysUserDO!=null){
+            userDao.updateMemberRole(purePhoneNumber, sysUserDO.getPhone());
+            userDao.updateServiceTeam(purePhoneNumber, sysUserDO.getPhone());
+            sysUserDO.setPhone(purePhoneNumber);
+            sysUserDO.setUserId(userId);
+            int i = userDao.updateById(sysUserDO);
+            if (i > 0) {
+                return R.ok(purePhoneNumber);
+            } else {
+                return R.fail("维护微信手机号失败");
+            }
         }
+        return R.ok(sysUserDO.getPhone());
     }
 
     /**
@@ -407,6 +410,17 @@
                     loginUserInfoVO.setIsAcidMember(2);
                 }
                 loginUserInfoVO.setRelationName(acidMember.getRelationName());
+            }
+            Integer count=userDao.selectOrgAdmin(phone);
+            if(count>0){
+                loginUserInfoVO.setIsCheckUnitAdmin(1);
+            }
+            else {
+                loginUserInfoVO.setIsCheckUnitAdmin(0);
+            }
+            Long checkUnitId=userDao.selectCheckUnitId(phone);
+            if(checkUnitId!=null){
+                loginUserInfoVO.setCheckUnitId(checkUnitId);
             }
             //是否网格员
             int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
@@ -2162,9 +2176,9 @@
     @Override
     public R getSysUserVOByPhone(String phone) {
         SysUserDO sysUserDO = userDao
-            .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1));
+            .selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, phone).eq(SysUserDO::getType, 1).orderByDesc(SysUserDO::getCreateAt).last("limit 1"));
         if (ObjectUtils.isEmpty(sysUserDO)) {
-            return R.fail("用户不存在");
+            return R.fail("账号或密码错误");
         }
         SysUserVO sysUserVO = new SysUserVO();
         BeanUtils.copyProperties(sysUserDO, sysUserVO);
@@ -2199,7 +2213,7 @@
         query.eq(SysUserDO::getType, type);
         SysUserDO sysUserDO = userDao.selectOne(query);
         if (ObjectUtils.isEmpty(sysUserDO)) {
-            return R.fail("用户不存在");
+            return R.fail("账号或密码错误");
         }
         SysUserVO sysUserVO = new SysUserVO();
         BeanUtils.copyProperties(sysUserDO, sysUserVO);
@@ -2972,7 +2986,7 @@
     public R getUserInfoByUnionId(String unionId) {
         SysUserDO sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getUnionid, unionId));
         if (isNull(sysUserDO)) {
-            return R.fail("用户不存在");
+            return R.fail("账号或密码错误");
         }
         LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
         BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
@@ -3266,9 +3280,7 @@
         }
         Map<String, String> headerMap=new HashMap<>();
         headerMap.put("appid","10000");
-        String url="https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000&timestamp="+uuLoginVO.getTimestamp()+"&sign="+uuLoginVO.getSign()+"&mobile="+uuLoginVO.getMobile();
         String resultJson=HttpClientUtil.get("https://api.uucsh.cn/member/wx/get-access?province="+uuLoginVO.getProvince()+"&city="+uuLoginVO.getCity()+"&area="+uuLoginVO.getArea()+"&appid=10000&timestamp="+uuLoginVO.getTimestamp()+"&sign="+uuLoginVO.getSign()+"&mobile="+uuLoginVO.getMobile(),headerMap,null);
-        //String resultJson=HttpClientUtil.sendPostByJson("https://api.uucsh.cn/member/wx/get-access", JSON.toJSONString(uuLoginVO),10,"appid",uuLoginVO.getAppid());
         JSONObject result = JSON.parseObject(resultJson);
         if(result.get("status").equals(1)){
             return R.ok(result.get("data"));

--
Gitblit v1.7.1