diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
index a0d9289..5503d4b 100644
--- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
+++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java
@@ -140,6 +140,12 @@ public class BmCompanyInfo implements Serializable {
@Excel(name = "被授权人身份证国徽面")
private String idNationUrl;
+ /**
+ * 被授权人邮箱
+ */
+ @Excel(name = "被授权人邮箱")
+ private String authEmail;
+
/**
* 创建时间
*/
diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java
index 526dfa5..627ec84 100644
--- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java
+++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java
@@ -11,9 +11,6 @@ public class BmCompanyVo {
//企业信息
private BmCompanyInfo bmCompanyInfo;
- @Excel(name = "被授权人邮箱")
- private String authEmail;
-
//企业开户行信息
private BmCoBank bmCoBank;
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 dd9a28b..fa089fd 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
@@ -103,13 +103,10 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService {
//根据id查询企业详情
BmCompanyInfo bmCompanyInfo = bmCompanyInfoMapper.selectByPrimaryKey(id);
- //获取被授权人手机号
- Integer userId = bmCompanyInfo.getCreator();
- //根据手机号查询被授权人邮箱
- SysUser sysUser = remoteUserService.selectUserById(userId.longValue()).getData();
+
BmCompanyVo bmCompanyVo = new BmCompanyVo();
bmCompanyVo.setBmCompanyInfo(bmCompanyInfo);
- bmCompanyVo.setAuthEmail(sysUser.getEmail());
+
bmCompanyVo.setBmCoBank(bmCoBankMapper.selectByCompanyId(bmCompanyInfo.getCompanyId()));
return bmCompanyVo;
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 8c38df7..63cfdda 100644
--- a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
+++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml
@@ -24,6 +24,7 @@
+
@@ -41,7 +42,7 @@
company_id, company_name, company_type, company_ltd, credit_code, register_address,
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,
+ id_face_url, id_nation_url, auth_email,create_time, creator, auditor, audit_time, audit_remark,
`status`, logo_url,update_time,legal_face_url,legal_nation_url
@@ -65,7 +66,7 @@
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,
+ id_nation_url,auth_email, create_time, creator,
auditor, audit_time, audit_remark,
`status`,logo_url update_time,legal_face_url,legal_nation_url)
values (#{companyName,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, #{companyLtd,jdbcType=VARCHAR},
@@ -74,7 +75,7 @@
#{legalPerson,jdbcType=VARCHAR}, #{invitationCode,jdbcType=VARCHAR}, #{invitationCoName,jdbcType=VARCHAR},
#{businessScope,jdbcType=VARCHAR}, #{authPerson,jdbcType=VARCHAR}, #{authIdNumber,jdbcType=VARCHAR},
#{authPhone,jdbcType=VARCHAR}, #{authDocument,jdbcType=VARCHAR}, #{idFaceUrl,jdbcType=VARCHAR},
- #{idNationUrl,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{creator,jdbcType=INTEGER},
+ #{idNationUrl,jdbcType=VARCHAR},#{authEmail,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{creator,jdbcType=INTEGER},
#{auditor,jdbcType=INTEGER}, #{auditTime,jdbcType=VARCHAR}, #{auditRemark,jdbcType=VARCHAR},
#{status,jdbcType=VARCHAR},#{logoUrl,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR},#{legalFaceUrl},#{legalNationUrl})
@@ -140,6 +141,9 @@
id_nation_url,
+
+ auth_email,
+
create_time,
@@ -229,6 +233,9 @@
#{idNationUrl,jdbcType=VARCHAR},
+
+ #{auth_email,jdbcType=VARCHAR},
+
#{createTime,jdbcType=VARCHAR},
@@ -323,6 +330,9 @@
id_nation_url = #{idNationUrl,jdbcType=VARCHAR},
+
+ auth_email = #{authEmail,jdbcType=VARCHAR},
+
create_time = #{createTime,jdbcType=VARCHAR},
@@ -379,6 +389,7 @@
auth_document = #{authDocument,jdbcType=VARCHAR},
id_face_url = #{idFaceUrl,jdbcType=VARCHAR},
id_nation_url = #{idNationUrl,jdbcType=VARCHAR},
+ auth_email = #{authEmail,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=VARCHAR},
creator = #{creator,jdbcType=INTEGER},
auditor = #{auditor,jdbcType=INTEGER},
diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java
index 014874a..760868a 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java
@@ -3,6 +3,7 @@ package com.bonus.zlpt.order;
import com.bonus.zlpt.common.security.annotation.EnableCustomConfig;
import com.bonus.zlpt.common.security.annotation.EnableRyFeignClients;
import com.bonus.zlpt.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.aop.framework.AopContext;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;