优化用户端代码

alien-lawyer/src/main/java/shop/alien/lawyer/controller/LawyerUserController.java

@@ -229,11 +229,8 @@ public class LawyerUserController {
         return lawyerUserService.getLawyerInfo(lawyerId);
     }
 
-
-
-
-    @ApiOperation("编辑新律师用户")
-    @ApiOperationSupport(order = 2)
+    @ApiOperation("更新律师用户信息")
+    @ApiOperationSupport(order = 15)
     @ApiImplicitParams({
             @ApiImplicitParam(name = "lawyerId", value = "律师ID", dataType = "Integer", paramType = "query", required = true),
             @ApiImplicitParam(name = "name", value = "律师姓名", dataType = "String", paramType = "query"),
@@ -243,10 +240,10 @@ public class LawyerUserController {
             @ApiImplicitParam(name = "headImg", value = "律师头像", dataType = "String", paramType = "query"),
             @ApiImplicitParam(name = "certificationTime", value = "认证时间（从业时间？？待确认）", dataType = "Data", paramType = "query"),
     })
-    @PostMapping("/upDateLawyerUser")
-    public R<LawyerUser> editLawyerUser(@RequestBody LawyerUserVo lawyerUserVo) {
-        log.info("LawyerUserController.upDateLawyerUser?lawyerUserVo={}",lawyerUserVo);
-        return lawyerUserService.upDateLawyerUser(lawyerUserVo);
+    @PostMapping("/updateLawyerUser")
+    public R<LawyerUser> updateLawyerUser(@RequestBody LawyerUserVo lawyerUserVo) {
+        log.info("LawyerUserController.updateLawyerUser?lawyerUserVo={}", lawyerUserVo);
+        return lawyerUserService.updateLawyerUser(lawyerUserVo);
     }
 
 }

alien-lawyer/src/main/java/shop/alien/lawyer/service/LawyerUserService.java

@@ -2,7 +2,6 @@ package shop.alien.lawyer.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.bind.annotation.RequestParam;
 import shop.alien.entity.result.R;
 import shop.alien.entity.store.LawyerUser;
 import shop.alien.entity.store.vo.LawyerUserVo;
@@ -132,7 +131,12 @@ public interface LawyerUserService extends IService<LawyerUser> {
      */
     R<LawyerUser> getLawyerInfo(Integer lawyerId);
 
-
-    R<LawyerUser> upDateLawyerUser(LawyerUserVo lawyerUserVo);
+    /**
+     * 更新律师用户信息
+     *
+     * @param lawyerUserVo 律师用户信息VO
+     * @return R<LawyerUser> 更新后的律师信息
+     */
+    R<LawyerUser> updateLawyerUser(LawyerUserVo lawyerUserVo);
 }
 

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

@@ -356,16 +356,16 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
     /**
      * 获取AI推荐律师列表
      *
-     * @param page 页码
-     *             pageSize 页大小
-     *             categoryId 分类ID
+     * @param page       页码
+     * @param size       页大小
+     * @param categoryId 分类ID
+     * @return R<IPage<LawyerUser>> 推荐律师列表
      */
     @Override
     public R<IPage<LawyerUser>> getAiRecommendList(int page, int size, Integer categoryId) {
-        log.info("LawyerUserController.aiRecommendList?page={},size={},categoryId={}",
+        log.info("LawyerUserServiceImpl.getAiRecommendList?page={},size={},categoryId={}",
                 page, size, categoryId);
 
-
         // 构建查询条件
         QueryWrapper<LawyerUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("delete_flag", 0)
@@ -444,20 +444,20 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             return R.fail("该律师账号已删除");
         }
 
-        List<LawyerConsultationOrder> list=lawyerConsultationOrderMapper.selectOrder(null, id);
-
+        List<LawyerConsultationOrder> orderList = lawyerConsultationOrderMapper.selectOrder(null, id);
 
-        if (!CollectionUtils.isEmpty( list)){
+        if (!CollectionUtils.isEmpty(orderList)) {
             // 提示前端有未完成订单 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){
+        // 只有无未完成订单且状态为禁用时，才执行注销操作
+        if (CollectionUtils.isEmpty(orderList) && lawyerUser.getStatus() == 0) {
             // 设置注销相关字段
             lawyerUser.setLogoutFlag(1); // 注销标记：1-已注销
             lawyerUser.setLogoutTime(new Date()); // 注销时间
@@ -467,10 +467,6 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             lawyerUser.setIsRecommended(0); // 推荐状态设置为不推荐
             lawyerUser.setLastOnlineTime(new Date());
 
-            // 如果传入了注销原因，可以在这里设置
-//         lawyerUser.setLogoutReason(logoutReason);
-//         lawyerUser.setLogoutCode(logoutCode);
-
             // 执行更新操作
             boolean result = this.updateById(lawyerUser);
             if (!result) {
@@ -517,34 +513,38 @@ public class LawyerUserServiceImpl extends ServiceImpl<LawyerUserMapper, LawyerU
             return R.fail("律师信息已删除");
         }
 
-        LawyerUserVo lawyerUserVo = new LawyerUserVo();
-        BeanUtils.copyProperties(lawyer, lawyerUserVo);
-
-        LawFirm lawFirm=lawFirmMapper.selectById(lawyer.getFirmId());
-        if (lawFirm!=null){
-            lawyerUserVo.setFirmName(lawFirm.getFirmName());
-            lawyerUserVo.setAddress(lawFirm.getAddress());
+        LawFirm lawFirm = lawFirmMapper.selectById(lawyer.getFirmId());
+        if (lawFirm != null) {
+            // 如果需要在返回对象中设置律所信息，可以在这里处理
+            // 目前直接返回 LawyerUser 对象
         }
 
-
-        // 为律师设置关联的法律问题场景列表
-//        List<LawyerUser> lawyerList = Collections.singletonList(lawyer);
-//        setLawyerScenarios(lawyerList);
-
         return R.data(lawyer);
     }
 
     @Override
-    public R<LawyerUser> upDateLawyerUser(LawyerUserVo lawyerUserVo) {
-        log.info("LawyerUserController.upDateLawyerUser?lawyerUserVo={}", lawyerUserVo);
+    public R<LawyerUser> updateLawyerUser(LawyerUserVo lawyerUserVo) {
+        log.info("LawyerUserServiceImpl.updateLawyerUser?lawyerUserVo={}", lawyerUserVo);
+        
+        // 参数校验
+        if (lawyerUserVo == null || lawyerUserVo.getId() == null) {
+            log.warn("更新律师用户信息失败：参数为空或律师ID为空");
+            return R.fail("律师ID不能为空");
+        }
+        
         LawyerUser lawyerUser = new LawyerUser();
         BeanUtils.copyProperties(lawyerUserVo, lawyerUser);
-//        Boolean result=this.updateById(lawyerUser);
-        Integer result=lawyerUserMapper.updateLawyerUser(lawyerUser);
-        if (result<=0){
+        
+        Integer result = lawyerUserMapper.updateLawyerUser(lawyerUser);
+        if (result <= 0) {
+            log.warn("更新律师用户信息失败：更新数据库失败，律师ID={}", lawyerUserVo.getId());
             return R.fail("修改律师信息失败");
         }
-        return R.success("修改律师信息失败");
+        
+        // 查询更新后的律师信息
+        LawyerUser updatedLawyer = this.getById(lawyerUserVo.getId());
+        log.info("更新律师用户信息成功，律师ID={}", lawyerUserVo.getId());
+        return R.data(updatedLawyer);
     }
 }