用户查询

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/UserAccountSimpleDTO.java

+package com.mmc.iuav.user.model.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author: zj
+ * @Date: 2023/5/18 17:28
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class UserAccountSimpleDTO implements Serializable {
+    private static final long serialVersionUID = 3451336520607073343L;
+    @ApiModelProperty(value = "用户id")
+    private Integer id;
+    @ApiModelProperty(value = "用户类型")
+    private Integer accountType;
+    @ApiModelProperty(value = "用户uid")
+    private String uid;
+    @ApiModelProperty(value = "手机号")
+    private String phoneNum;
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+    @ApiModelProperty(value = "用户头像")
+    private String userImg;
+    @ApiModelProperty(value = "用户性别：0未知、1男、2女")
+    private Integer userSex;
+    @ApiModelProperty(value = "用户邮箱")
+    private String email;
+    @ApiModelProperty(value = "用户来源，0自然流、1海报、2抖音、3公众号、4社群、5招投标、6官网")
+    private Integer source;
+    @ApiModelProperty(value = "用户可用状态：0禁用、1可用")
+    private Integer accountStatus;
+    @ApiModelProperty(value = "账号类型：0后台管理账号 ; 100云享飞-客户端;")
+    private Integer portType;
+    @ApiModelProperty(value = "企业认证状态, 0未通过，1通过")
+    private Integer companyAuthStatus;
+}
\ No newline at end of file

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/UserAccountController.java

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.controller;
 import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.group.Update;
 import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.vo.AppUserSucVO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 import com.mmc.iuav.user.model.vo.WxLoginVO;
@@ -41,4 +42,11 @@ public class UserAccountController {
         return userAccountService.update(userAccountVO);
     }
 
+    @ApiOperation(value = "获取用户基本信息")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = UserAccountSimpleDTO.class) })
+    @GetMapping("feignGetUserSimpleInfo")
+    public UserAccountSimpleDTO feignGetUserSimpleInfo(@RequestParam Integer userAccountId){
+        return userAccountService.getUserSimpleInfo(userAccountId);
+    }
+
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/WxController.java

 package com.mmc.iuav.user.controller;
 
+import com.mmc.iuav.response.ResultBody;
+import com.mmc.iuav.user.service.WxService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/17 11:16
@@ -12,4 +21,16 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/wx/")
 @RestController
 public class WxController {
+
+    @Autowired
+    private WxService wxService;
+
+    @ApiOperation(value = "小程序-获取当前用户的小程序推荐码")
+    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = String.class) })
+    @PostMapping("getAppletRcdCode")
+    public ResultBody getAppletRcdCode(HttpServletRequest request) {
+        return ResultBody.success();
+//        return wxService.getAppletCodeImgBase64(WxMsgDataConfig.USER_APPLET_PAGE_INDEX,
+//                WxHandler.createRcdScene(this.getCurrentUser(request).getId()));
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/CompanyAuthDO.java

@@ -35,4 +35,9 @@ public class CompanyAuthDO implements Serializable {
         this.creditCode = companyAuthVO.getCreditCode();
         this.licenseImg = companyAuthVO.getLicenseImg();
     }
+
+    public CompanyAuthVO buildCompanyAuth() {
+        return CompanyAuthVO.builder().id(this.id).companyName(this.companyName).userAccountId(this.userAccountId)
+                .creditCode(this.creditCode).authStatus(this.authStatus).licenseImg(this.licenseImg).build();
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/entity/UserAccountDO.java

 package com.mmc.iuav.user.entity;
 
+import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -54,4 +55,10 @@ public class UserAccountDO implements Serializable {
                 .userImg(this.userImg).userSex(this.userSex).email(this.email).source(this.source).accountStatus(this.accountStatus).remark(this.remark).portType(this.portType)
                 .createTime(this.createTime).build();
     }
+
+    public UserAccountSimpleDTO buildUserAccountSimpleDTO() {
+        return UserAccountSimpleDTO.builder().id(this.id).uid(this.uid).accountType(this.accountType).phoneNum(this.phoneNum).userName(this.userName).nickName(this.nickName)
+              .userImg(this.userImg).userSex(this.userSex).email(this.email).source(this.source).accountStatus(this.accountStatus).portType(this.portType)
+              .build();
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CompanyAuthService.java

@@ -21,4 +21,11 @@ public interface CompanyAuthService {
      * @return
      */
     ResultBody fuzzyQueryCompany(String searchKey);
+
+    /**
+     * 根据用户账号查询企业认证
+     * @param userAccountId
+     * @return
+     */
+    CompanyAuthVO getCompanyAuthByUId(Integer userAccountId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/UserAccountService.java

@@ -2,6 +2,7 @@ package com.mmc.iuav.user.service;
 
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.entity.UserAccountDO;
+import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
 
 /**
@@ -35,4 +36,11 @@ public interface UserAccountService {
      * @return
      */
     ResultBody update(UserAccountVO userAccountVO);
+
+    /**
+     * 获取用户基本信息
+     * @param userAccountId
+     * @return
+     */
+    UserAccountSimpleDTO getUserSimpleInfo(Integer userAccountId);
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyAuthServiceImpl.java

@@ -142,4 +142,13 @@ public class CompanyAuthServiceImpl implements CompanyAuthService {
             return ResultBody.error("无数据,请手动输入");
         }
     }
+
+    @Override
+    public CompanyAuthVO getCompanyAuthByUId(Integer userAccountId) {
+        CompanyAuthDO companyAuthDO = companyAuthDao.getCompanyAuth(userAccountId);
+        if (companyAuthDO == null){
+            return null;
+        }
+        return companyAuthDO.buildCompanyAuth();
+    }
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -3,7 +3,10 @@ package com.mmc.iuav.user.service.impl;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.dao.UserServiceDao;
 import com.mmc.iuav.user.entity.UserAccountDO;
+import com.mmc.iuav.user.model.dto.UserAccountSimpleDTO;
+import com.mmc.iuav.user.model.vo.CompanyAuthVO;
 import com.mmc.iuav.user.model.vo.UserAccountVO;
+import com.mmc.iuav.user.service.CompanyAuthService;
 import com.mmc.iuav.user.service.UserAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +21,9 @@ public class UserAccountServiceImpl implements UserAccountService {
     @Autowired
     private UserServiceDao userServiceDao;
 
+    @Autowired
+    private CompanyAuthService companyAuthService;
+
     @Override
     public UserAccountVO getUserAccountInfoByUnionId(String unionId) {
         UserAccountDO userAccountDO = userServiceDao.getUserAccountInfoByUnionId(unionId);
@@ -45,4 +51,17 @@ public class UserAccountServiceImpl implements UserAccountService {
         userServiceDao.update(userAccountDO);
         return ResultBody.success();
     }
+
+    @Override
+    public UserAccountSimpleDTO getUserSimpleInfo(Integer userAccountId) {
+        UserAccountDO userAccountDO = userServiceDao.getUserAccountById(userAccountId);
+        UserAccountSimpleDTO userAccountSimpleDTO = userAccountDO.buildUserAccountSimpleDTO();
+        CompanyAuthVO companyAuthVO = companyAuthService.getCompanyAuthByUId(userAccountId);
+        if (companyAuthVO != null) {
+            userAccountSimpleDTO.setCompanyAuthStatus(companyAuthVO.getAuthStatus());
+        }else {
+            userAccountSimpleDTO.setCompanyAuthStatus(0);
+        }
+        return userAccountSimpleDTO;
+    }
 }