需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1315,10 +1315,10 @@ public class UserLogic {
         user.updateById();
 
         if (CollectionUtils.isNotEmpty(workerImgs)) {
-            workerImgService.lambdaUpdate().eq(WorkerImg::getWebsitId,currentCompanyWechat.getUserId()).remove();
+            workerImgService.lambdaUpdate().eq(WorkerImg::getUserId,currentCompanyWechat.getUserId()).remove();
             for (WorkerImg workerImg : workerImgs) {
                 workerImg.setWebsitId(websitId);
-                workerImg.setWorkerId(currentCompanyWechat.getUserId());
+                workerImg.setUserId(currentCompanyWechat.getUserId());
             }
             workerImgService.saveBatch(workerImgs);
         }

mall-server-api/src/main/java/com/gree/mall/manager/bean/user/UserDetail.java

@@ -0,0 +1,22 @@
+package com.gree.mall.manager.bean.user;
+
+import com.gree.mall.manager.plus.entity.User;
+import com.gree.mall.manager.plus.entity.WorkerImg;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.elasticsearch.client.license.LicensesStatus;
+
+import java.util.List;
+
+@ApiModel
+@Data
+public class UserDetail extends User {
+
+    @ApiModelProperty(value = "图片")
+    private List<WorkerImg> workerImgs;
+
+
+
+
+}

mall-server-api/src/main/java/com/gree/mall/manager/controller/member/MemberController.java

@@ -10,6 +10,7 @@ import com.gree.mall.manager.bean.listvo.UserVO;
 import com.gree.mall.manager.bean.listvo.workorder.UserWaitVO;
 import com.gree.mall.manager.bean.member.UserApplyBean;
 import com.gree.mall.manager.bean.user.UserApplyWorkerBean;
+import com.gree.mall.manager.bean.user.UserDetail;
 import com.gree.mall.manager.bean.user.UserWxBean;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.exception.RemoteServiceException;
@@ -364,6 +365,17 @@ public class MemberController {
         return ResponseHelper.success(detail);
     }
 
+
+    @PostMapping("/getUserDetail")
+    @ApiOperation(value = "用户详情")
+    public ResponseHelper<UserDetail> getUserDetail(
+            @ApiParam(value = "会员id", required = true) @RequestParam String userId
+    ) {
+        UserDetail detail = userLogic.getUserDetail(userId);
+        return ResponseHelper.success(detail);
+    }
+
+
     @PostMapping("/updateNickName")
     @ApiOperation(value = "修改会员昵称")
     public ResponseHelper<Void> updateNickName(

mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/WorkerManagerLogic.java

@@ -175,7 +175,7 @@ public class WorkerManagerLogic {
 
         workerManagerDetail.setUser(userService.getById(workerManagerDetail.getUserId()));
 
-        List<WorkerImg> list = workerImgService.lambdaQuery().eq(WorkerImg::getWorkerId, websitUser.getUserId()).list();
+        List<WorkerImg> list = workerImgService.lambdaQuery().eq(WorkerImg::getUserId, websitUser.getUserId()).list();
 
         List<WorkerPolicy> workerPolicies = workerPolicyService.lambdaQuery().eq(WorkerPolicy::getWebsitUserId, websitUser.getId()).list();
 

mall-server-api/src/main/java/com/gree/mall/manager/logic/user/UserLogic.java

@@ -14,10 +14,7 @@ import com.gree.mall.manager.bean.listvo.UserVO;
 import com.gree.mall.manager.bean.listvo.workorder.UserWaitVO;
 import com.gree.mall.manager.bean.member.MemberSortBean;
 import com.gree.mall.manager.bean.member.UserApplyBean;
-import com.gree.mall.manager.bean.user.UserApplyWorkerBean;
-import com.gree.mall.manager.bean.user.UserDetailBean;
-import com.gree.mall.manager.bean.user.UserWxBean;
-import com.gree.mall.manager.bean.user.UserWxCustomerBean;
+import com.gree.mall.manager.bean.user.*;
 import com.gree.mall.manager.commonmapper.*;
 import com.gree.mall.manager.enums.ExamineStatusEnum;
 import com.gree.mall.manager.enums.PolicyOrderStutasEnum;
@@ -1107,4 +1104,15 @@ public class UserLogic {
                 .eq(UserWait::getWorkerNumber,userWait.getWorkerNumber())
                 .set(UserWait::getMobile,userWait.getMobile()).update();
     }
+
+    public UserDetail getUserDetail(String userId) {
+        User user = userService.getById(userId);
+
+        UserDetail userDetail = BeanUtil.toBean(user, UserDetail.class);
+
+        List<WorkerImg> workerImgs = workerImgService.lambdaQuery().eq(WorkerImg::getUserId, userId).list();
+
+        userDetail.setWorkerImgs(workerImgs);
+        return userDetail;
+    }
 }