diff --git a/zlpt-gateway/src/main/resources/bootstrap.yml b/zlpt-gateway/src/main/resources/bootstrap.yml index ae13866..ecde584 100644 --- a/zlpt-gateway/src/main/resources/bootstrap.yml +++ b/zlpt-gateway/src/main/resources/bootstrap.yml @@ -19,7 +19,7 @@ spring: config: # 配置中心地址 server-addr: 192.168.0.14:8848 - namespace: zlpt_cloud_dev + namespace: zlp t_cloud_dev # 配置文件格式 file-extension: yml # 共享配置 diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BmCompanyInfo.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BmCompanyInfo.java index 2125ee5..1be956f 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BmCompanyInfo.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/domain/BmCompanyInfo.java @@ -150,7 +150,7 @@ public class BmCompanyInfo implements Serializable { * 创建人 */ @Excel(name = "创建人") - private String creator; + private Integer creator; /** * 审核人 @@ -182,5 +182,11 @@ public class BmCompanyInfo implements Serializable { @Excel(name = "修改时间") private String updateTime; + @Excel(name = "法人身份证头像面") + private String legalFaceUrl; + + @Excel(name = "法人身份证国徽面") + private String legalNationUrl; + } \ No newline at end of file diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java index d192d04..72e7c03 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java @@ -64,7 +64,7 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { public int insertSelective(BmCompanyInfoDto record) { record.getBmCompanyInfo().setCreateTime(LocalDateTime.now().toString()); - record.getBmCompanyInfo().setCreator(SecurityUtils.getUsername()); + record.getBmCompanyInfo().setCreator(SecurityUtils.getUserId().intValue()); record.getBmCompanyInfo().setStatus("0"); bmCompanyInfoMapper.insertSelective(record.getBmCompanyInfo()); record.getBmCoBank().setCoId(record.getBmCompanyInfo().getCompanyId()); @@ -110,9 +110,9 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { //根据id查询企业详情 BmCompanyInfo bmCompanyInfo = bmCompanyInfoMapper.selectByPrimaryKey(id); //获取被授权人手机号 - String authPhone = bmCompanyInfo.getAuthPhone(); + Integer userId = bmCompanyInfo.getCreator(); //根据手机号查询被授权人邮箱 - SysUser sysUser = bmCompanyInfoMapper.selectUserByPhoneNumber(authPhone); + SysUser sysUser = sysUserMapper.selectUserById(userId.longValue()); BmCompanyVo bmCompanyVo = new BmCompanyVo(); bmCompanyVo.setBmCompanyInfo(bmCompanyInfo); bmCompanyVo.setAuthEmail(sysUser.getEmail()); @@ -132,9 +132,9 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { for (BmCompanyInfo bmCompanyInfo : list) { - String authPhone = bmCompanyInfo.getAuthPhone(); + Integer userId = bmCompanyInfo.getCreator(); //获取当前被授权用户信息 - SysUser sysUser = bmCompanyInfoMapper.selectUserByPhoneNumber(authPhone); + SysUser sysUser = sysUserMapper.selectUserById(userId.longValue()); int count = selectUserCount(sysUser); BmCompanyInfoVo bmCompanyInfoVo = new BmCompanyInfoVo(); bmCompanyInfoVo.setUserCount(count); diff --git a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml index cee8f2b..665784d 100644 --- a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml +++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml @@ -25,13 +25,15 @@ - + + + @@ -40,7 +42,7 @@ operate_address, certificateType, id_number, business_license, legal_person, invitation_code, invitation_co_name, business_scope, auth_person, auth_id_number, auth_phone, auth_document, id_face_url, id_nation_url, create_time, creator, auditor, audit_time, audit_remark, - `status`, logo_url,update_time + `status`, logo_url,update_time,legal_face_url,legal_nation_url