team/qnc-server-tob
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix updateQuery

Browse Source
This commit is contained in:
liangzai 2025-04-17 11:50:33 +08:00
parent ccf8b4e161
commit bb38af71c6
3 changed files with 22 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/user/cmd/api/desc/query.api
View File

@ -102,11 +102,13 @@ service main {
@handler queryDetailByOrderNo
get /query/orderNo/:order_no (QueryDetailByOrderNoReq) returns (QueryDetailByOrderNoResp)
@doc "重试查询"
@handler queryRetry
post /query/retry/:id (QueryRetryReq) returns (QueryRetryResp)
@doc "更新查询数据"
@handler updateQueryData
post /query/update_data (UpdateQueryDataReq) returns (UpdateQueryDataResp)
}
// 获取查询临时订单
@ -178,6 +180,18 @@ type (
}
)
type (
UpdateQueryDataReq {
Id int64 `json:"id"` // 查询ID
QueryData string `json:"query_data"` // 查询数据(未加密的JSON)
}
UpdateQueryDataResp {
Id int64 `json:"id"`
UpdatedAt string `json:"updated_at"` // 更新时间
}
)
@server (
prefix: api/v1
group: query
@ -190,9 +204,6 @@ service main {
@handler queryDetail
get /query/:id (QueryDetailReq) returns (QueryDetailResp)
@doc "更新查询数据"
@handler updateQueryData
post /query/update_data (UpdateQueryDataReq) returns (UpdateQueryDataResp)
}
type QuerySingleTestReq {
@ -205,13 +216,3 @@ type QuerySingleTestResp {
Api string `json:"api"`
}
type (
UpdateQueryDataReq {
Id int64 `json:"id"` // 查询ID
QueryData string `json:"query_data"` // 查询数据(未加密的JSON)
}
UpdateQueryDataResp {
Id int64 `json:"id"`
UpdatedAt string `json:"updated_at"` // 更新时间
}
)

12
app/user/cmd/api/internal/handler/routes.go
View File

@ -298,6 +298,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/query/retry/:id",
Handler: query.QueryRetryHandler(serverCtx),
},
{
// 更新查询数据
Method: http.MethodPost,
Path: "/query/update_data",
Handler: query.UpdateQueryDataHandler(serverCtx),
},
},
rest.WithJwt(serverCtx.Config.JwtAuth.AccessSecret),
rest.WithPrefix("/api/v1"),
@ -316,12 +322,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/query/single/test",
Handler: query.QuerySingleTestHandler(serverCtx),
},
{
// 更新查询数据
Method: http.MethodPost,
Path: "/query/update_data",
Handler: query.UpdateQueryDataHandler(serverCtx),
},
},
rest.WithPrefix("/api/v1"),
)

78
app/user/cmd/api/internal/logic/agent/activateagentmembershiplogic.go
View File

@ -83,81 +83,3 @@ func (l *ActivateAgentMembershipLogic) ActivateAgentMembership(req *types.AgentA
Id: outTradeNo,
}, nil
}
// func (l *ActivateAgentMembershipLogic) ActivateAgentMembership(req *types.AgentActivateMembershipReq) (resp *types.AgentActivateMembershipResp, err error) {
// //userID, err := ctxdata.GetUidFromCtx(l.ctx)
// //if err != nil {
// // return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户ID失败: %v", err)
// //}
// secretKey := l.svcCtx.Config.Encrypt.SecretKey
// encryptedMobile, err := crypto.EncryptMobile(req.Mobile, secretKey)
// if err != nil {
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "加密手机号失败: %v", err)
// }
// userModel, err := l.svcCtx.UserModel.FindOneByMobile(l.ctx, encryptedMobile)
// if err != nil {
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理信息失败: %v", err)
// }
// // 查询用户代理信息
// agentModel, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userModel.Id)
// if err != nil && err != sql.ErrNoRows {
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理信息失败: %v", err)
// }
// // 定义等级顺序映射
// levelOrder := map[string]int{
// "": 1,
// model.AgentLeveNameNormal: 1,
// model.AgentLeveNameVIP: 2,
// model.AgentLeveNameSVIP: 3,
// }
// // 验证请求等级合法性
// if _, valid := levelOrder[req.Type]; !valid {
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "无效的代理等级: %s", req.Type)
// }
// // 如果存在代理记录，进行等级验证
// if agentModel != nil {
// currentLevel, exists := levelOrder[agentModel.LevelName]
// if !exists {
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR),
// "非法的当前代理等级: %s", agentModel.LevelName)
// }
// requestedLevel := levelOrder[req.Type]
// if requestedLevel < currentLevel {
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR),
// "禁止降级操作（当前等级：%s，请求等级：%s）", agentModel.LevelName, req.Type)
// }
// }
// err = l.svcCtx.AgentModel.Trans(l.ctx, func(transCtx context.Context, session sqlx.Session) error {
// agentModel.LevelName = req.Type
// agentModel.MembershipExpiryTime = RenewMembership(agentModel.MembershipExpiryTime)
// transErr := l.svcCtx.AgentModel.UpdateWithVersion(transCtx, session, agentModel)
// if transErr != nil {
// return transErr
// }
// agentMembershipRechargeOrder := model.AgentMembershipRechargeOrder{
// AgentId: agentModel.Id,
// UserId: userModel.Id,
// LevelName: req.Type,
// Amount: req.Amount,
// PaymentMethod: req.PaymentMethod,
// TransactionId: req.TransactionId,
// }
// _, transErr = l.svcCtx.AgentMembershipRechargeOrderModel.Insert(transCtx, session, &agentMembershipRechargeOrder)
// if transErr != nil {
// return transErr
// }
// return nil
// })
// if err != nil {
// return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "升级代理等级失败: %s", req.Type)
// }
// return &types.AgentActivateMembershipResp{
// MembershipType: req.Type,
// ExpireTime: agentModel.MembershipExpiryTime.Time.Format("2006-01-02 15:04:05"),
// }, nil
// }