team/ycc-proxy-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
liangzai
2025-12-27 14:50:13 +08:00
parent 7b47f4512f
commit e6485c034f
5 changed files with 135 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/api/desc/front/agent.api
View File

@@ -414,11 +414,13 @@ type (
Mobile string `json:"mobile"` // 手机号 Mobile string `json:"mobile"` // 手机号
CreateTime string `json:"create_time"` // 加入团队时间 CreateTime string `json:"create_time"` // 加入团队时间
TodayQueries int64 `json:"today_queries"` // 当日查询量 TodayQueries int64 `json:"today_queries"` // 当日查询量
MonthQueries int64 `json:"month_queries"` // 本月查询量
TotalQueries int64 `json:"total_queries"` // 总查询量 TotalQueries int64 `json:"total_queries"` // 总查询量
TotalRebateAmount float64 `json:"total_rebate_amount"` // 返佣给我的总金额 TotalRebateAmount float64 `json:"total_rebate_amount"` // 返佣给我的总金额
TodayRebateAmount float64 `json:"today_rebate_amount"` // 返佣给我的今日金额 TodayRebateAmount float64 `json:"today_rebate_amount"` // 返佣给我的今日金额
TotalInvites int64 `json:"total_invites"` // 邀请加入团队的总人数 TotalInvites int64 `json:"total_invites"` // 邀请加入团队的总人数
TodayInvites int64 `json:"today_invites"` // 邀请加入团队的今日人数 TodayInvites int64 `json:"today_invites"` // 邀请加入团队的今日人数
MonthInvites int64 `json:"month_invites"` // 邀请加入团队的本月人数
IsDirect bool `json:"is_direct"` // 是否直接下级 IsDirect bool `json:"is_direct"` // 是否直接下级
} }
// 收益信息 // 收益信息

2
app/main/api/etc/main.yaml
View File

@@ -16,7 +16,7 @@ VerifyCode:
AccessKeyID: "LTAI5tKGB3TVJbMHSoZN3yr9" AccessKeyID: "LTAI5tKGB3TVJbMHSoZN3yr9"
AccessKeySecret: "OCQ30GWp4yENMjmfOAaagksE18bp65" AccessKeySecret: "OCQ30GWp4yENMjmfOAaagksE18bp65"
EndpointURL: "dysmsapi.aliyuncs.com" EndpointURL: "dysmsapi.aliyuncs.com"
SignName: "天远查" SignName: "海南海宇大数据"
TemplateCode: "SMS_302641455" TemplateCode: "SMS_302641455"
ValidTime: 300 ValidTime: 300
Encrypt: Encrypt:

9
app/main/api/internal/logic/agent/getteamlistlogic.go
View File

@@ -170,7 +170,7 @@ func (l *GetTeamListLogic) GetTeamList(req *types.GetTeamListReq) (resp *types.G
// 11. 组装响应列表 // 11. 组装响应列表
var list []types.TeamMemberItem var list []types.TeamMemberItem
for _, member := range teamMembers { for _, member := range teamMembers {
memberItem := l.buildTeamMemberItem(agent.Id, member, directSubordinateIds, todayStart) memberItem := l.buildTeamMemberItem(agent.Id, member, directSubordinateIds, todayStart, monthStart)
list = append(list, memberItem) list = append(list, memberItem)
} }
@@ -284,7 +284,7 @@ func (l *GetTeamListLogic) countDistinctOrdersForMember(ctx context.Context, bui
} }
// buildTeamMemberItem 构建团队成员项 // buildTeamMemberItem 构建团队成员项
func (l *GetTeamListLogic) buildTeamMemberItem(agentId string, member *model.Agent, directSubordinateIds map[string]bool, todayStart time.Time) types.TeamMemberItem { func (l *GetTeamListLogic) buildTeamMemberItem(agentId string, member *model.Agent, directSubordinateIds map[string]bool, todayStart, monthStart time.Time) types.TeamMemberItem {
levelName := "" levelName := ""
switch member.Level { switch member.Level {
case 1: case 1:
@@ -310,6 +310,8 @@ func (l *GetTeamListLogic) buildTeamMemberItem(agentId string, member *model.Age
totalQueries := l.countDistinctOrdersForMember(l.ctx, rebateBuilder) totalQueries := l.countDistinctOrdersForMember(l.ctx, rebateBuilder)
todayRebateBuilder := rebateBuilder.Where("create_time >= ?", todayStart) todayRebateBuilder := rebateBuilder.Where("create_time >= ?", todayStart)
todayQueries := l.countDistinctOrdersForMember(l.ctx, todayRebateBuilder) todayQueries := l.countDistinctOrdersForMember(l.ctx, todayRebateBuilder)
monthRebateBuilder := rebateBuilder.Where("create_time >= ?", monthStart)
monthQueries := l.countDistinctOrdersForMember(l.ctx, monthRebateBuilder)
// 统计返佣给我的金额（从agent_rebate表，source_agent_id = member.Id, agent_id = agentId） // 统计返佣给我的金额（从agent_rebate表，source_agent_id = member.Id, agent_id = agentId）
totalRebateAmount, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, rebateBuilder, "rebate_amount") totalRebateAmount, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, rebateBuilder, "rebate_amount")
@@ -320,6 +322,7 @@ func (l *GetTeamListLogic) buildTeamMemberItem(agentId string, member *model.Age
Where("parent_id = ? AND relation_type = ? AND del_state = ?", member.Id, 1, globalkey.DelStateNo) Where("parent_id = ? AND relation_type = ? AND del_state = ?", member.Id, 1, globalkey.DelStateNo)
totalInvites, _ := l.svcCtx.AgentRelationModel.FindCount(l.ctx, inviteBuilder, "id") totalInvites, _ := l.svcCtx.AgentRelationModel.FindCount(l.ctx, inviteBuilder, "id")
todayInvites, _ := l.svcCtx.AgentRelationModel.FindCount(l.ctx, inviteBuilder.Where("create_time >= ?", todayStart), "id") todayInvites, _ := l.svcCtx.AgentRelationModel.FindCount(l.ctx, inviteBuilder.Where("create_time >= ?", todayStart), "id")
monthInvites, _ := l.svcCtx.AgentRelationModel.FindCount(l.ctx, inviteBuilder.Where("create_time >= ?", monthStart), "id")
// 判断是否直接下级 // 判断是否直接下级
isDirect := directSubordinateIds[member.Id] isDirect := directSubordinateIds[member.Id]
@@ -331,11 +334,13 @@ func (l *GetTeamListLogic) buildTeamMemberItem(agentId string, member *model.Age
Mobile: mobile, Mobile: mobile,
CreateTime: member.CreateTime.Format("2006-01-02 15:04:05"), CreateTime: member.CreateTime.Format("2006-01-02 15:04:05"),
TodayQueries: todayQueries, TodayQueries: todayQueries,
MonthQueries: monthQueries,
TotalQueries: totalQueries, TotalQueries: totalQueries,
TotalRebateAmount: totalRebateAmount, TotalRebateAmount: totalRebateAmount,
TodayRebateAmount: todayRebateAmount, TodayRebateAmount: todayRebateAmount,
TotalInvites: totalInvites, TotalInvites: totalInvites,
TodayInvites: todayInvites, TodayInvites: todayInvites,
MonthInvites: monthInvites,
IsDirect: isDirect, IsDirect: isDirect,
} }
} }

246
app/main/api/internal/logic/query/queryservicelogic.go
View File

@@ -59,41 +59,41 @@ var productProcessors = map[string]func(*QueryServiceLogic, *types.QueryServiceR
func (l *QueryServiceLogic) PreprocessLogic(req *types.QueryServiceReq, product string) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) PreprocessLogic(req *types.QueryServiceReq, product string) (*types.QueryServiceResp, error) {
if processor, exists := productProcessors[product]; exists { if processor, exists := productProcessors[product]; exists {
return processor(l, req) // 璋冪敤瀵瑰簲鐨勫鐞嗗嚱鏁? return processor(l, req) // 调用相应的处理函数
} }
return nil, errors.New("鏈壘鍒扮浉搴旂殑澶勭悊绋嬪簭") return nil, errors.New("未找到相应的处理程序")
} }
func (l *QueryServiceLogic) ProcessMarriageLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessMarriageLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.MarriageReq var data types.MarriageReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -101,7 +101,7 @@ func (l *QueryServiceLogic) ProcessMarriageLogic(req *types.QueryServiceReq) (*t
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "marriage", userID) cacheNo, cacheDataErr := l.CacheData(params, "marriage", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -109,10 +109,10 @@ func (l *QueryServiceLogic) ProcessMarriageLogic(req *types.QueryServiceReq) (*t
} }
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %v", err)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -122,38 +122,38 @@ func (l *QueryServiceLogic) ProcessMarriageLogic(req *types.QueryServiceReq) (*t
}, nil }, nil
} }
// 澶勭悊瀹舵斂鏈嶅姟鐩稿叧閫昏緫 // 处理家政服务相关逻辑
func (l *QueryServiceLogic) ProcessHomeServiceLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessHomeServiceLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.HomeServiceReq var data types.HomeServiceReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -161,7 +161,7 @@ func (l *QueryServiceLogic) ProcessHomeServiceLogic(req *types.QueryServiceReq)
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "homeservice", userID) cacheNo, cacheDataErr := l.CacheData(params, "homeservice", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -170,10 +170,10 @@ func (l *QueryServiceLogic) ProcessHomeServiceLogic(req *types.QueryServiceReq)
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -183,38 +183,38 @@ func (l *QueryServiceLogic) ProcessHomeServiceLogic(req *types.QueryServiceReq)
}, nil }, nil
} }
// 澶勭悊椋庨櫓璇勪及鐩稿叧閫昏緫 // 处理风险评估相关逻辑
func (l *QueryServiceLogic) ProcessRiskAssessmentLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessRiskAssessmentLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.RiskAssessmentReq var data types.RiskAssessmentReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -222,7 +222,7 @@ func (l *QueryServiceLogic) ProcessRiskAssessmentLogic(req *types.QueryServiceRe
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "riskassessment", userID) cacheNo, cacheDataErr := l.CacheData(params, "riskassessment", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -231,10 +231,10 @@ func (l *QueryServiceLogic) ProcessRiskAssessmentLogic(req *types.QueryServiceRe
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -244,37 +244,37 @@ func (l *QueryServiceLogic) ProcessRiskAssessmentLogic(req *types.QueryServiceRe
}, nil }, nil
} }
// 澶勭悊鍏徃淇℃伅鏌ヨ鐩稿叧閫昏緫 // 处理公司信息查询相关逻辑
func (l *QueryServiceLogic) ProcessCompanyInfoLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessCompanyInfoLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.CompanyInfoReq var data types.CompanyInfoReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -282,7 +282,7 @@ func (l *QueryServiceLogic) ProcessCompanyInfoLogic(req *types.QueryServiceReq)
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "companyinfo", userID) cacheNo, cacheDataErr := l.CacheData(params, "companyinfo", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -291,10 +291,10 @@ func (l *QueryServiceLogic) ProcessCompanyInfoLogic(req *types.QueryServiceReq)
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -304,38 +304,38 @@ func (l *QueryServiceLogic) ProcessCompanyInfoLogic(req *types.QueryServiceReq)
}, nil }, nil
} }
// 澶勭悊绉熻祦淇℃伅鏌ヨ鐩稿叧閫昏緫 // 处理租赁信息查询相关逻辑
func (l *QueryServiceLogic) ProcessRentalInfoLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessRentalInfoLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.RentalInfoReq var data types.RentalInfoReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -343,7 +343,7 @@ func (l *QueryServiceLogic) ProcessRentalInfoLogic(req *types.QueryServiceReq) (
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "rentalinfo", userID) cacheNo, cacheDataErr := l.CacheData(params, "rentalinfo", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -352,10 +352,10 @@ func (l *QueryServiceLogic) ProcessRentalInfoLogic(req *types.QueryServiceReq) (
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -365,38 +365,38 @@ func (l *QueryServiceLogic) ProcessRentalInfoLogic(req *types.QueryServiceReq) (
}, nil }, nil
} }
// 澶勭悊璐峰墠鑳屾櫙妫€鏌ョ浉鍏抽€昏緫 // 处理贷前背景检查相关逻辑
func (l *QueryServiceLogic) ProcessPreLoanBackgroundCheckLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessPreLoanBackgroundCheckLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.PreLoanBackgroundCheckReq var data types.PreLoanBackgroundCheckReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -404,7 +404,7 @@ func (l *QueryServiceLogic) ProcessPreLoanBackgroundCheckLogic(req *types.QueryS
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "preloanbackgroundcheck", userID) cacheNo, cacheDataErr := l.CacheData(params, "preloanbackgroundcheck", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -413,10 +413,10 @@ func (l *QueryServiceLogic) ProcessPreLoanBackgroundCheckLogic(req *types.QueryS
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -426,37 +426,37 @@ func (l *QueryServiceLogic) ProcessPreLoanBackgroundCheckLogic(req *types.QueryS
}, nil }, nil
} }
// 澶勭悊浜轰簨鑳岃皟鐩稿叧閫昏緫 // 处理人事背调相关逻辑
func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.BackgroundCheckReq var data types.BackgroundCheckReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -464,7 +464,7 @@ func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceR
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "backgroundcheck", userID) cacheNo, cacheDataErr := l.CacheData(params, "backgroundcheck", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -473,10 +473,10 @@ func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceR
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -486,35 +486,35 @@ func (l *QueryServiceLogic) ProcessBackgroundCheckLogic(req *types.QueryServiceR
}, nil }, nil
} }
func (l *QueryServiceLogic) ProcessPersonalDataLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessPersonalDataLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.PersonalDataReq var data types.PersonalDataReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -522,7 +522,7 @@ func (l *QueryServiceLogic) ProcessPersonalDataLogic(req *types.QueryServiceReq)
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "personalData", userID) cacheNo, cacheDataErr := l.CacheData(params, "personalData", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -531,10 +531,10 @@ func (l *QueryServiceLogic) ProcessPersonalDataLogic(req *types.QueryServiceReq)
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -544,35 +544,35 @@ func (l *QueryServiceLogic) ProcessPersonalDataLogic(req *types.QueryServiceReq)
}, nil }, nil
} }
func (l *QueryServiceLogic) ProcessConsumerFinanceReportLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) { func (l *QueryServiceLogic) ProcessConsumerFinanceReportLogic(req *types.QueryServiceReq) (*types.QueryServiceResp, error) {
// AES瑙ｅ瘑 // AES解密
decryptData, DecryptDataErr := l.DecryptData(req.Data) decryptData, DecryptDataErr := l.DecryptData(req.Data)
if DecryptDataErr != nil { if DecryptDataErr != nil {
return nil, DecryptDataErr return nil, DecryptDataErr
} }
// 鏍￠獙鍙傛暟 // 校验参数
var data types.ConsumerFinanceReportReq var data types.ConsumerFinanceReportReq
if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil { if unmarshalErr := json.Unmarshal(decryptData, &data); unmarshalErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 瑙ｅ瘑鍚庣殑鏁版嵁鏍煎紡涓嶆纭? %+v", unmarshalErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 解密后的数据格式不正确: %+v", unmarshalErr)
} }
if validatorErr := validator.Validate(data); validatorErr != nil { if validatorErr := validator.Validate(data); validatorErr != nil {
return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "鏌ヨ鏈嶅姟, 鍙傛暟涓嶆纭? %+v", validatorErr) return nil, errors.Wrapf(xerr.NewErrCodeMsg(xerr.PARAM_VERIFICATION_ERROR, validatorErr.Error()), "查询服务, 参数不正确: %+v", validatorErr)
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
verifyCodeErr := l.VerifyCode(data.Mobile, data.Code) verifyCodeErr := l.VerifyCode(data.Mobile, data.Code)
if verifyCodeErr != nil { if verifyCodeErr != nil {
return nil, verifyCodeErr return nil, verifyCodeErr
} }
// 鏍￠獙涓夎绱? // 校验三要素
verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile) verifyErr := l.Verify(data.Name, data.IDCard, data.Mobile)
if verifyErr != nil { if verifyErr != nil {
return nil, verifyErr return nil, verifyErr
} }
// 缂撳瓨 // 缓存
params := map[string]interface{}{ params := map[string]interface{}{
"name": data.Name, "name": data.Name,
"id_card": data.IDCard, "id_card": data.IDCard,
@@ -580,7 +580,7 @@ func (l *QueryServiceLogic) ProcessConsumerFinanceReportLogic(req *types.QuerySe
} }
userID, err := l.GetOrCreateUser() userID, err := l.GetOrCreateUser()
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 澶勭悊鐢ㄦ埛澶辫触: %v", err) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 处理用户失败: %v", err)
} }
cacheNo, cacheDataErr := l.CacheData(params, "consumerFinanceReport", userID) cacheNo, cacheDataErr := l.CacheData(params, "consumerFinanceReport", userID)
if cacheDataErr != nil { if cacheDataErr != nil {
@@ -589,10 +589,10 @@ func (l *QueryServiceLogic) ProcessConsumerFinanceReportLogic(req *types.QuerySe
token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID) token, err := l.svcCtx.UserService.GeneralUserToken(l.ctx, userID)
if err != nil { if err != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鐢熸垚token澶辫触 : %d", userID) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 生成token失败 : %d", userID)
} }
// 鑾峰彇褰撳墠鏃堕棿鎴? // 获取当前时间戳
now := time.Now().Unix() now := time.Now().Unix()
return &types.QueryServiceResp{ return &types.QueryServiceResp{
Id: cacheNo, Id: cacheNo,
@@ -605,43 +605,43 @@ func (l *QueryServiceLogic) DecryptData(data string) ([]byte, error) {
secretKey := l.svcCtx.Config.Encrypt.SecretKey secretKey := l.svcCtx.Config.Encrypt.SecretKey
key, decodeErr := hex.DecodeString(secretKey) key, decodeErr := hex.DecodeString(secretKey)
if decodeErr != nil { if decodeErr != nil {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "瀵嗛挜鑾峰彇澶辫触: %+v", decodeErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "秘钥获取失败: %+v", decodeErr)
} }
decryptData, aesDecryptErr := crypto.AesDecrypt(data, key) decryptData, aesDecryptErr := crypto.AesDecrypt(data, key)
if aesDecryptErr != nil || len(decryptData) == 0 { if aesDecryptErr != nil || len(decryptData) == 0 {
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "瑙ｅ瘑澶辫触: %+v", aesDecryptErr) return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "解密失败: %+v", aesDecryptErr)
} }
return decryptData, nil return decryptData, nil
} }
// 鏍￠獙楠岃瘉鐮? // 校验验证码
func (l *QueryServiceLogic) VerifyCode(mobile string, code string) error { func (l *QueryServiceLogic) VerifyCode(mobile string, code string) error {
// 寮€鍙戠幆澧冧笅璺宠繃楠岃瘉鐮佹牎楠? // 开发环境下跳过验证码校验
if os.Getenv("ENV") == "development" { if os.Getenv("ENV") == "development" {
return nil return nil
} }
secretKey := l.svcCtx.Config.Encrypt.SecretKey secretKey := l.svcCtx.Config.Encrypt.SecretKey
encryptedMobile, err := crypto.EncryptMobile(mobile, secretKey) encryptedMobile, err := crypto.EncryptMobile(mobile, secretKey)
if err != nil { if err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鍔犲瘑鎵嬫満鍙峰け璐? %+v", err) return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "加密手机号失败: %+v", err)
} }
codeRedisKey := fmt.Sprintf("%s:%s", "query", encryptedMobile) codeRedisKey := fmt.Sprintf("%s:%s", "query", encryptedMobile)
cacheCode, err := l.svcCtx.Redis.Get(codeRedisKey) cacheCode, err := l.svcCtx.Redis.Get(codeRedisKey)
if err != nil { if err != nil {
if errors.Is(err, redis.Nil) { if errors.Is(err, redis.Nil) {
return errors.Wrapf(xerr.NewErrMsg("楠岃瘉鐮佸凡杩囨湡"), "楠岃瘉鐮佽繃鏈? %s", mobile) return errors.Wrapf(xerr.NewErrMsg("验证码已过期"), "验证码过期: %s", mobile)
} }
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "璇诲彇楠岃瘉鐮乺edis缂撳瓨澶辫触, mobile: %s, err: %+v", mobile, err) return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "读取验证码redis缓存失败, mobile: %s, err: %+v", mobile, err)
} }
if cacheCode != code { if cacheCode != code {
return errors.Wrapf(xerr.NewErrMsg("楠岃瘉鐮佷笉姝ｇ‘"), "楠岃瘉鐮佷笉姝ｇ‘: %s", mobile) return errors.Wrapf(xerr.NewErrMsg("验证码不正确"), "验证码不正确: %s", mobile)
} }
return nil return nil
} }
// 浜屻€佷笁瑕佺礌楠岃瘉 // 二、三要素验证
func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) error { func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) error {
// 寮€鍙戠幆澧冧笅璺宠繃浜?涓夎绱犻獙璇? // 开发环境下跳过二、三要素验证
if os.Getenv("ENV") == "development" { if os.Getenv("ENV") == "development" {
return nil return nil
} }
@@ -652,13 +652,13 @@ func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) er
} }
verification, err := l.svcCtx.VerificationService.TwoFactorVerification(twoVerification) verification, err := l.svcCtx.VerificationService.TwoFactorVerification(twoVerification)
if err != nil { if err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "浜岃绱犻獙璇佸け璐? %v", err) return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "二要素验证失败: %v", err)
} }
if !verification.Passed { if !verification.Passed {
return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "浜岃绱犻獙璇佷笉閫氳繃: %v", err) return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "二要素验证不通过: %v", err)
} }
} else { } else {
// 涓夎绱犻獙璇? // 三要素验证
threeVerification := service.ThreeFactorVerificationRequest{ threeVerification := service.ThreeFactorVerificationRequest{
Name: Name, Name: Name,
IDCard: IDCard, IDCard: IDCard,
@@ -666,30 +666,30 @@ func (l *QueryServiceLogic) Verify(Name string, IDCard string, Mobile string) er
} }
verification, err := l.svcCtx.VerificationService.ThreeFactorVerification(threeVerification) verification, err := l.svcCtx.VerificationService.ThreeFactorVerification(threeVerification)
if err != nil { if err != nil {
return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "涓夎绱犻獙璇佸け璐? %v", err) return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "三要素验证失败: %v", err)
} }
if !verification.Passed { if !verification.Passed {
return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "涓夎绱犻獙璇佷笉閫氳繃: %v", err) return errors.Wrapf(xerr.NewErrCodeMsg(xerr.SERVER_COMMON_ERROR, verification.Err.Error()), "三要素验证不通过: %v", err)
} }
} }
return nil return nil
} }
// 缂撳瓨 // 缓存
func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product string, userID string) (string, error) { func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product string, userID string) (string, error) {
agentIdentifier, _ := l.ctx.Value("agentIdentifier").(string) agentIdentifier, _ := l.ctx.Value("agentIdentifier").(string)
secretKey := l.svcCtx.Config.Encrypt.SecretKey secretKey := l.svcCtx.Config.Encrypt.SecretKey
key, decodeErr := hex.DecodeString(secretKey) key, decodeErr := hex.DecodeString(secretKey)
if decodeErr != nil { if decodeErr != nil {
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鑾峰彇AES瀵嗛挜澶辫触: %+v", decodeErr) return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 获取AES秘钥失败: %+v", decodeErr)
} }
paramsMarshal, marshalErr := json.Marshal(params) paramsMarshal, marshalErr := json.Marshal(params)
if marshalErr != nil { if marshalErr != nil {
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 搴忓垪鍖栧弬鏁板け璐? %+v", marshalErr) return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 序列化参数失败: %+v", marshalErr)
} }
encryptParams, aesEncryptErr := crypto.AesEncrypt(paramsMarshal, key) encryptParams, aesEncryptErr := crypto.AesEncrypt(paramsMarshal, key)
if aesEncryptErr != nil { if aesEncryptErr != nil {
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 鍔犲瘑鍙傛暟澶辫触: %+v", aesEncryptErr) return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 加密参数失败: %+v", aesEncryptErr)
} }
queryCache := types.QueryCacheLoad{ queryCache := types.QueryCacheLoad{
Params: encryptParams, Params: encryptParams,
@@ -698,7 +698,7 @@ func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product str
} }
jsonData, marshalErr := json.Marshal(queryCache) jsonData, marshalErr := json.Marshal(queryCache)
if marshalErr != nil { if marshalErr != nil {
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "鏌ヨ鏈嶅姟, 搴忓垪鍖栧弬鏁板け璐? %+v", marshalErr) return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "查询服务, 序列化参数失败: %+v", marshalErr)
} }
outTradeNo := "Q_" + l.svcCtx.AlipayService.GenerateOutTradeNo() outTradeNo := "Q_" + l.svcCtx.AlipayService.GenerateOutTradeNo()
redisKey := fmt.Sprintf(types.QueryCacheKey, userID, outTradeNo) redisKey := fmt.Sprintf(types.QueryCacheKey, userID, outTradeNo)
@@ -710,9 +710,9 @@ func (l *QueryServiceLogic) CacheData(params map[string]interface{}, Product str
} }
// GetOrCreateUser 获取或创建用户 // GetOrCreateUser 获取或创建用户
// 1. 如果已登录，使用当前登录用户 // 1. 如果已登录,使用当前登录用户
// 2. 如果未登录，创建临时用户（UUID用户） // 2. 如果未登录,创建临时用户(UUID用户)
// 注意：查询服务不负责手机号绑定，手机号绑定由用户在其他地方自主选择 // 注意:查询服务不负责手机号绑定,手机号绑定由用户在其他地方自主选择
func (l *QueryServiceLogic) GetOrCreateUser() (string, error) { func (l *QueryServiceLogic) GetOrCreateUser() (string, error) {
// 获取当前登录态 // 获取当前登录态
claims, err := ctxdata.GetClaimsFromCtx(l.ctx) claims, err := ctxdata.GetClaimsFromCtx(l.ctx)
@@ -721,12 +721,12 @@ func (l *QueryServiceLogic) GetOrCreateUser() (string, error) {
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户信息失败: %v", err) return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户信息失败: %v", err)
} }
// 如果已登录，使用当前登录用户 // 如果已登录,使用当前登录用户
if claims != nil { if claims != nil {
return claims.UserId, nil return claims.UserId, nil
} }
// 未登录：创建临时用户（UUID用户） // 未登录:创建临时用户(UUID用户)
userID, err := l.svcCtx.UserService.RegisterUUIDUser(l.ctx) userID, err := l.svcCtx.UserService.RegisterUUIDUser(l.ctx)
if err != nil { if err != nil {
return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "创建临时用户失败: %v", err) return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "创建临时用户失败: %v", err)

2
app/main/api/internal/types/types.go
View File

@@ -510,11 +510,13 @@ type TeamMemberItem struct {
Mobile string `json:"mobile"` // 手机号 Mobile string `json:"mobile"` // 手机号
CreateTime string `json:"create_time"` // 加入团队时间 CreateTime string `json:"create_time"` // 加入团队时间
TodayQueries int64 `json:"today_queries"` // 当日查询量 TodayQueries int64 `json:"today_queries"` // 当日查询量
MonthQueries int64 `json:"month_queries"` // 本月查询量
TotalQueries int64 `json:"total_queries"` // 总查询量 TotalQueries int64 `json:"total_queries"` // 总查询量
TotalRebateAmount float64 `json:"total_rebate_amount"` // 返佣给我的总金额 TotalRebateAmount float64 `json:"total_rebate_amount"` // 返佣给我的总金额
TodayRebateAmount float64 `json:"today_rebate_amount"` // 返佣给我的今日金额 TodayRebateAmount float64 `json:"today_rebate_amount"` // 返佣给我的今日金额
TotalInvites int64 `json:"total_invites"` // 邀请加入团队的总人数 TotalInvites int64 `json:"total_invites"` // 邀请加入团队的总人数
TodayInvites int64 `json:"today_invites"` // 邀请加入团队的今日人数 TodayInvites int64 `json:"today_invites"` // 邀请加入团队的今日人数
MonthInvites int64 `json:"month_invites"` // 邀请加入团队的本月人数
IsDirect bool `json:"is_direct"` // 是否直接下级 IsDirect bool `json:"is_direct"` // 是否直接下级
} }