Skip to content

phsl / api

Go to a project
Commit bf850f79 by lijinqi
Options

企业管理+企业申请接口完成

parent a9b447db
Showing with 258 additions and 57 deletions
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/partner/AppPartnerController.java 0 → 100644
package com.luhu.computility.module.biz.controller.app.partner;
import com.luhu.computility.framework.common.pojo.CommonResult;
import com.luhu.computility.framework.common.util.object.BeanUtils;
import com.luhu.computility.module.biz.controller.app.partner.vo.AppPartnerRespVO;
import com.luhu.computility.module.biz.dal.dataobject.partner.PartnerDO;
import com.luhu.computility.module.biz.service.partner.PartnerService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.ibatis.annotations.Param;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import java.util.List;
import static com.luhu.computility.framework.common.pojo.CommonResult.success;
@Tag(name = "管理后台 - 合作伙伴管理")
@RestController
@RequestMapping("/biz/partner")
@Validated
public class AppPartnerController {
@Resource
private PartnerService partnerService;
/**
* 获取合作伙伴详情
*/
@GetMapping(value = "/detail")
@Operation(summary = "合作伙伴详情")
@PermitAll
@ResponseBody
public CommonResult<AppPartnerRespVO> partnerDetail(@RequestParam(value = "id") Long id){
//业务实现部分
PartnerDO partner = partnerService.getPartner(id);
return success(BeanUtils.toBean(partner, AppPartnerRespVO.class));
}
@GetMapping("/all")
@Operation(summary = "获得所有合作伙伴")
@PermitAll
public CommonResult<List<AppPartnerRespVO>> getAllPartner() {
List<PartnerDO> partnerDOS = partnerService.getAllPartner();
return success(BeanUtils.toBean(partnerDOS, AppPartnerRespVO.class));
}
}
\ No newline at end of file
computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/app/partner/vo/AppPartnerRespVO.java 0 → 100644
package com.luhu.computility.module.biz.controller.app.partner.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "管理后台 - 合作伙伴管理 Response VO")
@Data
@ExcelIgnoreUnannotated
public class AppPartnerRespVO {
@Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28362")
private Long id;
@Schema(description = "展示图地址")
private List<String> image;
@Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
private String information;
@Schema(description = "标题", requiredMode = Schema.RequiredMode.REQUIRED)
private String title;
@Schema(description = "链接地址", example = "https://www.iocoder.cn")
private String url;
@Schema(description = "描述内容", example = "随便")
private String description;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "备注", example = "你说的对")
@ExcelProperty("备注")
private String remark;
}
\ No newline at end of file
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/enterprise/EnterpriseController.java
...@@ -55,7 +55,7 @@ public class EnterpriseController { ...@@ -55,7 +55,7 @@ public class EnterpriseController {
@PutMapping("/check") @PutMapping("/check")
@Operation(summary = "更新客户企业") @Operation(summary = "审核客户企业信息")
public CommonResult<Boolean> checkEnterprise(@Valid @RequestBody EnterpriseCheckReqVO checkReqVO) { public CommonResult<Boolean> checkEnterprise(@Valid @RequestBody EnterpriseCheckReqVO checkReqVO) {
enterpriseService.checkEnterprise(checkReqVO); enterpriseService.checkEnterprise(checkReqVO);
return success(true); return success(true);
...@@ -92,8 +92,8 @@ public class EnterpriseController { ...@@ -92,8 +92,8 @@ public class EnterpriseController {
@Operation(summary = "获得客户企业分页") @Operation(summary = "获得客户企业分页")
@PreAuthorize("@ss.hasPermission('member:enterprise:query')") @PreAuthorize("@ss.hasPermission('member:enterprise:query')")
public CommonResult<PageResult<EnterpriseRespVO>> getEnterprisePage(@Valid EnterprisePageReqVO pageReqVO) { public CommonResult<PageResult<EnterpriseRespVO>> getEnterprisePage(@Valid EnterprisePageReqVO pageReqVO) {
PageResult<EnterpriseRespVO> pageResult = enterpriseService.getEnterprisePage(pageReqVO); PageResult<EnterpriseDO> pageResult = enterpriseService.getEnterprisePage(pageReqVO);
return success(pageResult); return success(BeanUtils.toBean(pageResult, EnterpriseRespVO.class));
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
...@@ -103,7 +103,7 @@ public class EnterpriseController { ...@@ -103,7 +103,7 @@ public class EnterpriseController {
public void exportEnterpriseExcel(@Valid EnterprisePageReqVO pageReqVO, public void exportEnterpriseExcel(@Valid EnterprisePageReqVO pageReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<EnterpriseRespVO> list = enterpriseService.getEnterprisePage(pageReqVO).getList(); List<EnterpriseDO> list = enterpriseService.getEnterprisePage(pageReqVO).getList();
// 导出 Excel // 导出 Excel
ExcelUtils.write(response, "客户企业.xls", "数据", EnterpriseRespVO.class, ExcelUtils.write(response, "客户企业.xls", "数据", EnterpriseRespVO.class,
BeanUtils.toBean(list, EnterpriseRespVO.class)); BeanUtils.toBean(list, EnterpriseRespVO.class));
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/enterprise/vo/EnterprisePageReqVO.java
...@@ -13,11 +13,11 @@ import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_Y ...@@ -13,11 +13,11 @@ import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_Y
@Data @Data
public class EnterprisePageReqVO extends PageParam { public class EnterprisePageReqVO extends PageParam {
@Schema(description = "member用户名字", example = "6648") @Schema(description = "contactName", example = "6648")
private String memberUserName; private String contactName;
@Schema(description = "企业名称", example = "XX公司") @Schema(description = "企业名称", example = "XX公司")
private String name; private String enterpriseName;
@Schema(description = "法人") @Schema(description = "法人")
private String legalPerson; private String legalPerson;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/admin/enterprise/vo/EnterpriseRespVO.java
...@@ -7,6 +7,8 @@ import org.springframework.format.annotation.DateTimeFormat; ...@@ -7,6 +7,8 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*; import com.alibaba.excel.annotation.*;
import javax.validation.constraints.NotEmpty;
@Schema(description = "管理后台 - 客户企业 Response VO") @Schema(description = "管理后台 - 客户企业 Response VO")
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
...@@ -16,9 +18,9 @@ public class EnterpriseRespVO { ...@@ -16,9 +18,9 @@ public class EnterpriseRespVO {
@ExcelProperty("主键") @ExcelProperty("主键")
private Long id; private Long id;
@Schema(description = "member用户名", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648") @Schema(description = "contactName", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
@ExcelProperty("member用户名") @ExcelProperty("contactName")
private String memberUserName; private String contactName;
@Schema(description = "身份证", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648") @Schema(description = "身份证", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
@ExcelProperty("身份证") @ExcelProperty("身份证")
...@@ -34,12 +36,16 @@ public class EnterpriseRespVO { ...@@ -34,12 +36,16 @@ public class EnterpriseRespVO {
@Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "XX公司") @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "XX公司")
@ExcelProperty("企业名称") @ExcelProperty("企业名称")
private String name; private String enterpriseName;
@Schema(description = "法人", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "法人姓名", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("法人") @ExcelProperty("法人姓名")
private String legalPerson; private String legalPerson;
@Schema(description = "营业执照", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("营业执照不能为空")
private String businessLicense;
@Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("联系电话") @ExcelProperty("联系电话")
private String mobile; private String mobile;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/enterprise/AppEnterpriseController.java
...@@ -46,7 +46,7 @@ public class AppEnterpriseController { ...@@ -46,7 +46,7 @@ public class AppEnterpriseController {
private EnterpriseService enterpriseService; private EnterpriseService enterpriseService;
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建客户企业") @Operation(summary = "提交企业信息审核")
public CommonResult<Long> createEnterprise(@Valid @RequestBody AppEnterpriseSaveReqVO createReqVO) { public CommonResult<Long> createEnterprise(@Valid @RequestBody AppEnterpriseSaveReqVO createReqVO) {
return success(enterpriseService.createEnterpriseByMemberUser(getLoginUserId(),createReqVO)); return success(enterpriseService.createEnterpriseByMemberUser(getLoginUserId(),createReqVO));
} }
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/enterprise/vo/AppEnterpriseSaveReqVO.java
...@@ -14,14 +14,31 @@ public class AppEnterpriseSaveReqVO { ...@@ -14,14 +14,31 @@ public class AppEnterpriseSaveReqVO {
@Schema(description = "主键", example = "7191") @Schema(description = "主键", example = "7191")
private Long id; private Long id;
@Schema(description = "联系人姓名", requiredMode = Schema.RequiredMode.REQUIRED, example = "XX公司")
@NotEmpty(message = "联系人姓名不能为空")
private String contactName;
@Schema(description = "身份证", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
private String identityCard;
@Schema(description = "国徽面", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
private String nationalEmblemFace;
@Schema(description = "人像面", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
private String portraitFace;
@Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "XX公司") @Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "XX公司")
@NotEmpty(message = "企业名称不能为空") @NotEmpty(message = "企业名称不能为空")
private String name; private String enterpriseName;
@Schema(description = "法人", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "法人姓名", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "法人不能为空") @NotEmpty(message = "法人姓名不能为空")
private String legalPerson; private String legalPerson;
@Schema(description = "营业执照", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "营业执照不能为空")
private String businessLicense;
@Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "联系电话", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "联系电话不能为空") @NotEmpty(message = "联系电话不能为空")
private String mobile; private String mobile;
...@@ -33,13 +50,5 @@ public class AppEnterpriseSaveReqVO { ...@@ -33,13 +50,5 @@ public class AppEnterpriseSaveReqVO {
@Schema(description = "备注", example = "你说的对") @Schema(description = "备注", example = "你说的对")
private String remark; private String remark;
@Schema(description = "身份证", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
private String identityCard;
@Schema(description = "国徽面", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
private String nationalEmblemFace;
@Schema(description = "人像面", requiredMode = Schema.RequiredMode.REQUIRED, example = "6648")
private String portraitFace;
} }
\ No newline at end of file
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/user/AppMemberUserController.java
package com.luhu.computility.module.member.controller.app.user; package com.luhu.computility.module.member.controller.app.user;
import cn.hutool.core.util.ObjectUtil;
import com.luhu.computility.framework.common.pojo.CommonResult; import com.luhu.computility.framework.common.pojo.CommonResult;
import com.luhu.computility.framework.common.util.object.BeanUtils;
import com.luhu.computility.module.member.controller.app.user.vo.*; import com.luhu.computility.module.member.controller.app.user.vo.*;
import com.luhu.computility.module.member.convert.user.MemberUserConvert; import com.luhu.computility.module.member.convert.user.MemberUserConvert;
import com.luhu.computility.module.member.dal.dataobject.enterprise.EnterpriseDO;
import com.luhu.computility.module.member.dal.dataobject.level.MemberLevelDO; import com.luhu.computility.module.member.dal.dataobject.level.MemberLevelDO;
import com.luhu.computility.module.member.dal.dataobject.user.MemberUserDO; import com.luhu.computility.module.member.dal.dataobject.user.MemberUserDO;
import com.luhu.computility.module.member.enums.EnterpriseCheckStatus;
import com.luhu.computility.module.member.service.enterprise.EnterpriseService;
import com.luhu.computility.module.member.service.level.MemberLevelService; import com.luhu.computility.module.member.service.level.MemberLevelService;
import com.luhu.computility.module.member.service.user.MemberUserService; import com.luhu.computility.module.member.service.user.MemberUserService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
...@@ -31,6 +36,8 @@ public class AppMemberUserController { ...@@ -31,6 +36,8 @@ public class AppMemberUserController {
private MemberUserService userService; private MemberUserService userService;
@Resource @Resource
private MemberLevelService levelService; private MemberLevelService levelService;
@Resource
private EnterpriseService enterpriseService;
@GetMapping("/get") @GetMapping("/get")
@Operation(summary = "获得基本信息") @Operation(summary = "获得基本信息")
...@@ -40,6 +47,24 @@ public class AppMemberUserController { ...@@ -40,6 +47,24 @@ public class AppMemberUserController {
return success(MemberUserConvert.INSTANCE.convert(user, level)); return success(MemberUserConvert.INSTANCE.convert(user, level));
} }
@GetMapping("/getUserAndEnterpriseInfo")
@Operation(summary = "获得基本信息")
public CommonResult<AppEnterpriseUserInfoRespVO> getUserAndEnterpriseInfo() {
MemberUserDO user = userService.getUser(getLoginUserId());
EnterpriseDO enterprise = enterpriseService.getEnterprise(getLoginUserId());
AppEnterpriseUserInfoRespVO appEnterpriseUserInfoRespVO
= BeanUtils.toBean(user, AppEnterpriseUserInfoRespVO.class);
if (!ObjectUtil.isEmpty(enterprise)) {
appEnterpriseUserInfoRespVO.setEnterpriseName(enterprise.getEnterpriseName());
appEnterpriseUserInfoRespVO.setCheckStatus(enterprise.getStatus());
} else {
appEnterpriseUserInfoRespVO.setCheckStatus(EnterpriseCheckStatus.UNSUBMIT.getValue());
}
return success(appEnterpriseUserInfoRespVO);
}
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "修改基本信息") @Operation(summary = "修改基本信息")
public CommonResult<Boolean> updateUser(@RequestBody @Valid AppMemberUserUpdateReqVO reqVO) { public CommonResult<Boolean> updateUser(@RequestBody @Valid AppMemberUserUpdateReqVO reqVO) {
......
computility-module-member/src/main/java/com/luhu/computility/module/member/controller/app/user/vo/AppEnterpriseUserInfoRespVO.java 0 → 100644
package com.luhu.computility.module.member.controller.app.user.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDateTime;
@Schema(description = "用户 APP - 用户企业个人信息 Response VO")
@Data
@NoArgsConstructor
@AllArgsConstructor
public class AppEnterpriseUserInfoRespVO {
@Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "huhua")
private String nickname;
@Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.iocoder.cn/xxx.png")
private String avatar;
@Schema(description = "用户手机号", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601691300")
private String mobile;
@Schema(description = "注册时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private LocalDateTime createTime;
@Schema(description = "审核状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private Integer checkStatus;
@Schema(description = "企业名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private String enterpriseName;
}
computility-module-member/src/main/java/com/luhu/computility/module/member/dal/dataobject/enterprise/EnterpriseDO.java
package com.luhu.computility.module.member.dal.dataobject.enterprise; package com.luhu.computility.module.member.dal.dataobject.enterprise;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*; import java.util.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -28,27 +30,47 @@ public class EnterpriseDO extends BaseDO { ...@@ -28,27 +30,47 @@ public class EnterpriseDO extends BaseDO {
@TableId @TableId
private Long id; private Long id;
/** /**
* member用户id * 客户Id
*/ */
private Long memberUserId; private Long memberUserId;
/** /**
* 企业名称 * 联系人
*/ */
private String name; private String contactName;
/** /**
* 法人 * 身份证号
*/ */
private String legalPerson; private String identityCard;
/**
* 国徽面
*/
private String nationalEmblemFace;
/**
* 人像面
*/
private String portraitFace;
/** /**
* 联系电话 * 联系电话
*/ */
private String mobile; private String mobile;
/** /**
* 企业名称
*/
private String enterpriseName;
/**
* 法人
*/
private String legalPerson;
/**
* 承诺书 * 承诺书
*/ */
private String letterOfCommitment; private String letterOfCommitment;
/** /**
* 是否审核 * 营业执照
*/
private String businessLicense;
/**
* 审核状态
*/ */
private Integer status; private Integer status;
/** /**
......
computility-module-member/src/main/java/com/luhu/computility/module/member/dal/dataobject/user/MemberUserDO.java
...@@ -141,19 +141,6 @@ public class MemberUserDO extends TenantBaseDO { ...@@ -141,19 +141,6 @@ public class MemberUserDO extends TenantBaseDO {
* 关联 {@link MemberGroupDO#getId()} 字段 * 关联 {@link MemberGroupDO#getId()} 字段
*/ */
private Long groupId; private Long groupId;
/**
* 身份证号
*/
private String identityCard;
/**
* 国徽面
*/
private String nationalEmblemFace;
/**
* 人像面
*/
private String portraitFace;
} }
computility-module-member/src/main/java/com/luhu/computility/module/member/dal/mysql/enterprise/EnterpriseMapper.java
...@@ -8,6 +8,7 @@ import com.luhu.computility.framework.common.pojo.PageResult; ...@@ -8,6 +8,7 @@ import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX; import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX; import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
import com.luhu.computility.framework.mybatis.core.query.MPJLambdaWrapperX; import com.luhu.computility.framework.mybatis.core.query.MPJLambdaWrapperX;
import com.luhu.computility.framework.mybatis.core.query.QueryWrapperX;
import com.luhu.computility.module.member.dal.dataobject.enterprise.EnterpriseDO; import com.luhu.computility.module.member.dal.dataobject.enterprise.EnterpriseDO;
import com.luhu.computility.module.member.dal.dataobject.user.MemberUserDO; import com.luhu.computility.module.member.dal.dataobject.user.MemberUserDO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -22,17 +23,22 @@ import org.springframework.util.StringUtils; ...@@ -22,17 +23,22 @@ import org.springframework.util.StringUtils;
@Mapper @Mapper
public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> { public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
/* default PageResult<EnterpriseDO> selectPage(EnterprisePageReqVO reqVO) { default PageResult<EnterpriseDO> selectPage(EnterprisePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<EnterpriseDO>() return selectPage(reqVO, new LambdaQueryWrapperX<EnterpriseDO>()
.likeIfPresent(EnterpriseDO::getName, reqVO.getName()) .likeIfPresent(EnterpriseDO::getEnterpriseName, reqVO.getEnterpriseName())
.likeIfPresent(EnterpriseDO::getLegalPerson, reqVO.getLegalPerson()) .likeIfPresent(EnterpriseDO::getLegalPerson, reqVO.getLegalPerson())
.likeIfPresent(EnterpriseDO::getMobile, reqVO.getMobile())
.eqIfPresent(EnterpriseDO::getStatus, reqVO.getStatus()) .eqIfPresent(EnterpriseDO::getStatus, reqVO.getStatus())
.betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(EnterpriseDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(EnterpriseDO::getId)); .orderByDesc(EnterpriseDO::getId));
}*/ }
default EnterpriseDO getEnterpriseByUserId(Long userId) {
return selectOne(EnterpriseDO::getMemberUserId, userId);
}
default PageResult<EnterpriseRespVO> selectPage(EnterprisePageReqVO reqVO) { /* default PageResult<EnterpriseRespVO> selectPage(EnterprisePageReqVO reqVO) {
return selectJoinPage(reqVO, EnterpriseRespVO.class, new MPJLambdaWrapperX<EnterpriseDO>() return selectJoinPage(reqVO, EnterpriseRespVO.class, new MPJLambdaWrapperX<EnterpriseDO>()
.selectAll(EnterpriseDO.class) .selectAll(EnterpriseDO.class)
.select(MemberUserDO::getMobile) .select(MemberUserDO::getMobile)
...@@ -46,7 +52,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> { ...@@ -46,7 +52,7 @@ public interface EnterpriseMapper extends BaseMapperX<EnterpriseDO> {
.like(!StringUtils.isEmpty(reqVO.getMemberUserName()), MemberUserDO::getName, reqVO.getMemberUserName()) .like(!StringUtils.isEmpty(reqVO.getMemberUserName()), MemberUserDO::getName, reqVO.getMemberUserName())
.between(!ArrayUtil.hasNull(reqVO.getCreateTime()), EnterpriseDO::getCreateTime, ArrayUtil.get(reqVO.getCreateTime(), 0), ArrayUtil.get(reqVO.getCreateTime(), 1)) .between(!ArrayUtil.hasNull(reqVO.getCreateTime()), EnterpriseDO::getCreateTime, ArrayUtil.get(reqVO.getCreateTime(), 0), ArrayUtil.get(reqVO.getCreateTime(), 1))
.orderByDesc(EnterpriseDO::getId)); .orderByDesc(EnterpriseDO::getId));
} }*/
/*return selectJoinPage(queryVO, FruitRespVO.class, new MPJLambdaWrapperX<FruitDO>() /*return selectJoinPage(queryVO, FruitRespVO.class, new MPJLambdaWrapperX<FruitDO>()
.selectAll(FruitDO.class) .selectAll(FruitDO.class)
......
computility-module-member/src/main/java/com/luhu/computility/module/member/enums/EnterpriseCheckStatus.java
...@@ -10,7 +10,8 @@ public enum EnterpriseCheckStatus { ...@@ -10,7 +10,8 @@ public enum EnterpriseCheckStatus {
// 请根据实际情况改成对应的值和备注 // 请根据实际情况改成对应的值和备注
UNCHECK(0, "待审核"), UNCHECK(0, "待审核"),
CHECKED(1, "审核通过"), CHECKED(1, "审核通过"),
CHECK_FAILED(2, "审核未通过"); CHECK_FAILED(2, "审核未通过"),
UNSUBMIT(3, "待申请");
private int value; private int value;
private String remark; private String remark;
......
computility-module-member/src/main/java/com/luhu/computility/module/member/service/enterprise/EnterpriseService.java
...@@ -71,7 +71,7 @@ public interface EnterpriseService { ...@@ -71,7 +71,7 @@ public interface EnterpriseService {
* @param pageReqVO 分页查询 * @param pageReqVO 分页查询
* @return 客户企业分页 * @return 客户企业分页
*/ */
PageResult<EnterpriseRespVO> getEnterprisePage(EnterprisePageReqVO pageReqVO); PageResult<EnterpriseDO> getEnterprisePage(EnterprisePageReqVO pageReqVO);
/** /**
...@@ -82,5 +82,13 @@ public interface EnterpriseService { ...@@ -82,5 +82,13 @@ public interface EnterpriseService {
*/ */
Long createEnterpriseByMemberUser(Long userId, AppEnterpriseSaveReqVO createReqVO); Long createEnterpriseByMemberUser(Long userId, AppEnterpriseSaveReqVO createReqVO);
/**
* 根据用户id获取企业信息
*
* @param id 用户id
* @return 企业信息
*/
EnterpriseDO getEnterpriseByUserId(Long id);
} }
\ No newline at end of file
computility-module-member/src/main/java/com/luhu/computility/module/member/service/enterprise/EnterpriseServiceImpl.java
...@@ -61,10 +61,6 @@ public class EnterpriseServiceImpl implements EnterpriseService { ...@@ -61,10 +61,6 @@ public class EnterpriseServiceImpl implements EnterpriseService {
enterprise.setStatus(EnterpriseCheckStatus.UNCHECK.getValue()); enterprise.setStatus(EnterpriseCheckStatus.UNCHECK.getValue());
enterprise.setMemberUserId(userId); enterprise.setMemberUserId(userId);
enterpriseMapper.insert(enterprise); enterpriseMapper.insert(enterprise);
memberUserService.updateUser(userId, new AppMemberUserUpdateReqVO()
.setIdentityCard(createReqVO.getIdentityCard())
.setNationalEmblemFace(createReqVO.getNationalEmblemFace())
.setPortraitFace(createReqVO.getPortraitFace()));
// 返回 // 返回
return enterprise.getId(); return enterprise.getId();
} }
...@@ -117,8 +113,14 @@ public class EnterpriseServiceImpl implements EnterpriseService { ...@@ -117,8 +113,14 @@ public class EnterpriseServiceImpl implements EnterpriseService {
return enterpriseMapper.selectById(id); return enterpriseMapper.selectById(id);
} }
@Override
public EnterpriseDO getEnterpriseByUserId(Long id) {
return enterpriseMapper.selectById(id);
}
@Override @Override
public PageResult<EnterpriseRespVO> getEnterprisePage(EnterprisePageReqVO pageReqVO) { public PageResult<EnterpriseDO> getEnterprisePage(EnterprisePageReqVO pageReqVO) {
return enterpriseMapper.selectPage(pageReqVO); return enterpriseMapper.selectPage(pageReqVO);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment