|
|
@@ -24,6 +24,7 @@ import (
|
|
|
"app.yhyue.com/moapp/jybase/mongodb"
|
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
|
"app.yhyue.com/moapp/jybase/usercenter"
|
|
|
+ "app.yhyue.com/moapp/jypkg/common/src/qfw/util/dataexport"
|
|
|
"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
|
"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/pb"
|
|
|
)
|
|
|
@@ -119,6 +120,17 @@ func (this *UserAccount) GetAccountInfo() {
|
|
|
}
|
|
|
}
|
|
|
b := jy.GetBigVipUserBaseMsg(this.Session(), *config.Middleground)
|
|
|
+ //s从数据导出填写的邮箱或者从数据定制服务这里获取的邮箱
|
|
|
+ _, otherMail := dataexport.GetLastExportPhoneAndMail(util.Mysql, userId, qutil.ObjToString(this.GetSession("entUserId")))
|
|
|
+ if otherMail == "" {
|
|
|
+ saleData, _ := util.MQFW.FindOne("saleLeads", map[string]interface{}{
|
|
|
+ "source": "certificateServices-pc-biddingDetailPage-content",
|
|
|
+ "userid": this.GetSession("userId"),
|
|
|
+ })
|
|
|
+ if saleData != nil && len(*saleData) > 0 {
|
|
|
+ otherMail = qutil.ObjToString((*saleData)["mail"])
|
|
|
+ }
|
|
|
+ }
|
|
|
return map[string]interface{}{
|
|
|
"userId": encrypt.EncodeArticleId(userId),
|
|
|
"email": qutil.ObjToString((*userMsg)["s_myemail"]),
|
|
|
@@ -132,6 +144,7 @@ func (this *UserAccount) GetAccountInfo() {
|
|
|
"company": qutil.ObjToString((*userMsg)["s_company"]),
|
|
|
"isWx": isWx, //是否是微信账号
|
|
|
"breakRenewTip": breakRenewTip,
|
|
|
+ "otherMail": otherMail, //从数据导出填写的邮箱或者从数据定制服务这里获取的邮箱
|
|
|
}, nil
|
|
|
}()
|
|
|
this.ServeJson(NewResult(rData, errMsg))
|
