Merge branch 'sit' of http://8.152.195.41:3000/alien/alien_cloud into sit

alien-lawyer/src/main/java/shop/alien/lawyer/service/impl/LawyerUserServiceImpl.java

@@ -505,9 +505,9 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
         String key = "lawyer_" + lawyerUser.getPhone();
         String redisVerificationCode = baseRedisService.getString(key);
         //对redisVerificationCode进行校验，如果不是空的话清除redis中的记录
-        if (redisVerificationCode != null) {
-            baseRedisService.delete(key);
-        }
+//        if (redisVerificationCode != null) {
+//            baseRedisService.delete(key);
+//        }
         // 检查是否已经注销
         if (lawyerUser.getLogoutFlag() != null && lawyerUser.getLogoutFlag() == 1) {
             log.warn("注销律师用户失败：律师已注销，律师ID={}, 律师姓名={}", id, lawyerUser.getName());
@@ -520,49 +520,57 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             return R.fail("该律师账号已删除");
         }
 
-        List<LawyerConsultationOrder> list=lawyerConsultationOrderMapper.selectOrder(null, id);
+        List<LawyerConsultationOrder> list = lawyerConsultationOrderMapper.selectOrder(null, id);
 
 
-        if (!CollectionUtils.isEmpty( list)){
+        if (!CollectionUtils.isEmpty(list)) {
             // 提示前端有未完成订单 1：有未完成订单  0：无未完成订单
             resultMap.put("unfinishedOrder", 1);
         }
 
-        if (lawyerUser.getOrderReceivingStatus() != null && lawyerUser.getOrderReceivingStatus() == 1){
+        if (lawyerUser.getOrderReceivingStatus() != null && lawyerUser.getOrderReceivingStatus() == 1) {
             // 提示前端接单状态为接单中 1：接单中  0：未接单
             resultMap.put("orderReceivingStatus", 1);
         }
 
-        if (CollectionUtils.isEmpty( list) && lawyerUser.getStatus() == 0){
-            // 设置注销相关字段
-            lawyerUser.setLogoutFlag(1); // 注销标记：1-已注销
-            lawyerUser.setLogoutTime(new Date()); // 注销时间
-            lawyerUser.setStatus(0); // 状态设置为禁用
-            lawyerUser.setOrderReceivingStatus(0); // 接单状态设置为不接单
-            lawyerUser.setIsOnline(0); // 在线状态设置为离线
-            lawyerUser.setIsRecommended(0); // 推荐状态设置为不推荐
-            lawyerUser.setIsOnline(0);
-            lawyerUser.setDeleteFlag(1);
-            lawyerUser.setLastOnlineTime(new Date());
-
-            // 执行更新操作
-            boolean result = this.updateById(lawyerUser);
-            if (!result) {
-                log.error("注销律师用户失败：更新数据库失败，律师ID={}", id);
-                return R.fail("注销失败，请稍后重试");
-            }
+        if (lawyerUser.getOrderReceivingStatus() != null) {
+
+            if (CollectionUtils.isEmpty(list) && lawyerUser.getOrderReceivingStatus() == 0) {
+                // 设置注销相关字段
+                lawyerUser.setLogoutFlag(1); // 注销标记：1-已注销
+                lawyerUser.setLogoutTime(new Date()); // 注销时间
+                lawyerUser.setStatus(0); // 状态设置为禁用
+                lawyerUser.setOrderReceivingStatus(0); // 接单状态设置为不接单
+                lawyerUser.setIsOnline(0); // 在线状态设置为离线
+                lawyerUser.setIsRecommended(0); // 推荐状态设置为不推荐
+                lawyerUser.setIsOnline(0);
+                lawyerUser.setDeleteFlag(1);
+                lawyerUser.setLastOnlineTime(new Date());
+
+                // 执行更新操作
+                boolean result = this.updateById(lawyerUser);
+                if (!result) {
+                    log.error("注销律师用户失败：更新数据库失败，律师ID={}", id);
+                    return R.fail("注销失败，请稍后重试");
+                }
 
-            log.info("注销律师用户成功，律师ID={}, 律师姓名={}, 注销时间={}",
-                    id, lawyerUser.getName(), lawyerUser.getLogoutTime());
-
-            // 构建返回结果
-            resultMap.put("id", lawyerUser.getId());
-            resultMap.put("name", lawyerUser.getName());
-            resultMap.put("phone", lawyerUser.getPhone());
-            resultMap.put("logoutFlag", lawyerUser.getLogoutFlag());
-            resultMap.put("logoutTime", lawyerUser.getLogoutTime());
-            resultMap.put("status", lawyerUser.getStatus());
-            resultMap.put("message", "律师账号注销成功");
+                //对redisVerificationCode进行校验，如果不是空的话清除redis中的记录
+                if (redisVerificationCode != null) {
+                    baseRedisService.delete(key);
+                }
+
+                log.info("注销律师用户成功，律师ID={}, 律师姓名={}, 注销时间={}",
+                        id, lawyerUser.getName(), lawyerUser.getLogoutTime());
+
+                // 构建返回结果
+                resultMap.put("id", lawyerUser.getId());
+                resultMap.put("name", lawyerUser.getName());
+                resultMap.put("phone", lawyerUser.getPhone());
+                resultMap.put("logoutFlag", lawyerUser.getLogoutFlag());
+                resultMap.put("logoutTime", lawyerUser.getLogoutTime());
+                resultMap.put("status", lawyerUser.getStatus());
+                resultMap.put("message", "律师账号注销成功");
+            }
         }
 
         return R.data(resultMap);