From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 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 a701acd..4239bff 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
@@ -343,6 +343,7 @@
         if (nonNull(sysUserDO.getStreetId())){
             loginUserInfoVO.setStreetId(sysUserDO.getStreetId());
         }
+        loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
         loginUserInfoVO.setUserId(sysUserDO.getUserId());
         loginUserInfoVO.setName(sysUserDO.getName());
         loginUserInfoVO.setPassword(sysUserDO.getPassword());
@@ -405,6 +406,7 @@
         }
         LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO();
         BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
+        loginUserInfoVO.setLoveIntegral(sysUserDO.getLoveIntegral());
         List<SysRoleDO> roleDOList = roleDAO.selectByUserId(sysUserDO.getUserId());
         Set<String> set = new HashSet<>();
         if (!ObjectUtils.isEmpty(roleDOList)) {
@@ -474,13 +476,16 @@
             if(count>0){
                 loginUserInfoVO.setIsCheckUnitAdmin(1);
             }
+            else {
+                loginUserInfoVO.setIsCheckUnitAdmin(0);
+            }
             Long checkUnitId=userDao.selectCheckUnitId(phone);
+            Long AdminUnitId=userDao.selectOrgAdminId(phone);
             if(checkUnitId!=null){
                 loginUserInfoVO.setCheckUnitId(checkUnitId);
             }
-
-            else {
-                loginUserInfoVO.setIsCheckUnitAdmin(0);
+            if (AdminUnitId!=null){
+                loginUserInfoVO.setBindingCheckUnitId(AdminUnitId);
             }
             //是否网格员
             int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
@@ -800,12 +805,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));
@@ -896,8 +903,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);
     }
 
@@ -2288,9 +2297,10 @@
      */
     @Override
     public CommunityUserInfoVO detailUserComunity(Long userId) {
-        CommunityUserInfoVO communityUserInfoVO = new CommunityUserInfoVO();
+        CommunityUserInfoVO communityUserInfoVO = null;
         SysUserDO sysUserDO = userDao.selectById(userId);
         if (!ObjectUtils.isEmpty(sysUserDO)) {
+            communityUserInfoVO = new CommunityUserInfoVO();
             String idCard = sysUserDO.getIdCard();
             if (!ObjectUtils.isEmpty(idCard)) {
                 communityUserInfoVO.setAge(IdCard.IdNOToAge(idCard));
@@ -3485,12 +3495,45 @@
         }
         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="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();
+        }
+
+
+        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.getUU(str,headerMap,null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         JSONObject result = JSON.parseObject(resultJson);
         if (result.get("status").equals(1)) {
             return R.ok(result.get("data"));
         }
-        return R.fail("信息错误");
+        return R.fail(resultJson,"信息错误");
     }
 
     @Override

--
Gitblit v1.7.1