f
This commit is contained in:
@@ -123,10 +123,11 @@ type TaxConfig struct {
|
||||
TaxExemptionAmount float64
|
||||
}
|
||||
type TianyuanapiConfig struct {
|
||||
AccessID string
|
||||
Key string
|
||||
BaseURL string
|
||||
Timeout int64
|
||||
AccessID string
|
||||
Key string
|
||||
BaseURL string
|
||||
Timeout int64
|
||||
WhitelistMgmtKey string
|
||||
}
|
||||
|
||||
type AuthorizationConfig struct {
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
package admin_query_whitelist
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/zeromicro/go-zero/rest/httpx"
|
||||
"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
"qnc-server/common/result"
|
||||
"qnc-server/pkg/lzkit/validator"
|
||||
)
|
||||
|
||||
func AdminQueryWhitelistAppendHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req types.AdminQueryWhitelistAppendReq
|
||||
if err := httpx.Parse(r, &req); err != nil {
|
||||
result.ParamErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
if err := validator.Validate(req); err != nil {
|
||||
result.ParamValidateErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
l := admin_query_whitelist.NewAdminQueryWhitelistAppendLogic(r.Context(), svcCtx)
|
||||
resp, err := l.AdminQueryWhitelistAppend(&req)
|
||||
result.HttpResult(r, w, resp, err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package admin_query_whitelist
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/zeromicro/go-zero/rest/httpx"
|
||||
"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
"qnc-server/common/result"
|
||||
"qnc-server/pkg/lzkit/validator"
|
||||
)
|
||||
|
||||
func AdminQueryWhitelistCreateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req types.AdminQueryWhitelistCreateReq
|
||||
if err := httpx.Parse(r, &req); err != nil {
|
||||
result.ParamErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
if err := validator.Validate(req); err != nil {
|
||||
result.ParamValidateErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
l := admin_query_whitelist.NewAdminQueryWhitelistCreateLogic(r.Context(), svcCtx)
|
||||
resp, err := l.AdminQueryWhitelistCreate(&req)
|
||||
result.HttpResult(r, w, resp, err)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package admin_query_whitelist
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/zeromicro/go-zero/rest/httpx"
|
||||
"qnc-server/app/main/api/internal/logic/admin_query_whitelist"
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
"qnc-server/common/result"
|
||||
"qnc-server/pkg/lzkit/validator"
|
||||
)
|
||||
|
||||
func AdminQueryWhitelistOpLogListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req types.AdminQueryWhitelistOpLogListReq
|
||||
if err := httpx.Parse(r, &req); err != nil {
|
||||
result.ParamErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
if err := validator.Validate(req); err != nil {
|
||||
result.ParamValidateErrorResult(r, w, err)
|
||||
return
|
||||
}
|
||||
l := admin_query_whitelist.NewAdminQueryWhitelistOpLogListLogic(r.Context(), svcCtx)
|
||||
resp, err := l.AdminQueryWhitelistOpLogList(&req)
|
||||
result.HttpResult(r, w, resp, err)
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,7 @@ import (
|
||||
admin_platform_user "qnc-server/app/main/api/internal/handler/admin_platform_user"
|
||||
admin_product "qnc-server/app/main/api/internal/handler/admin_product"
|
||||
admin_query "qnc-server/app/main/api/internal/handler/admin_query"
|
||||
admin_query_whitelist "qnc-server/app/main/api/internal/handler/admin_query_whitelist"
|
||||
admin_role "qnc-server/app/main/api/internal/handler/admin_role"
|
||||
admin_role_api "qnc-server/app/main/api/internal/handler/admin_role_api"
|
||||
admin_user "qnc-server/app/main/api/internal/handler/admin_user"
|
||||
@@ -368,18 +369,18 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
Path: "/retry-agent-process/:id",
|
||||
Handler: admin_order.AdminRetryAgentProcessHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
// xpay补发货(查微信单并到账)
|
||||
Method: http.MethodPost,
|
||||
Path: "/xpay-deliver/:id",
|
||||
Handler: admin_order.AdminXpayDeliverHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
// 更新订单
|
||||
Method: http.MethodPut,
|
||||
Path: "/update/:id",
|
||||
Handler: admin_order.AdminUpdateOrderHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
// xpay补发货(查微信单并到账)
|
||||
Method: http.MethodPost,
|
||||
Path: "/xpay-deliver/:id",
|
||||
Handler: admin_order.AdminXpayDeliverHandler(serverCtx),
|
||||
},
|
||||
}...,
|
||||
),
|
||||
rest.WithPrefix("/api/v1/admin/order"),
|
||||
@@ -508,6 +509,33 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
rest.WithPrefix("/api/v1/admin/query"),
|
||||
)
|
||||
|
||||
server.AddRoutes(
|
||||
rest.WithMiddlewares(
|
||||
[]rest.Middleware{serverCtx.AdminAuthInterceptor},
|
||||
[]rest.Route{
|
||||
{
|
||||
// 追加查询白名单产品编码
|
||||
Method: http.MethodPost,
|
||||
Path: "/append",
|
||||
Handler: admin_query_whitelist.AdminQueryWhitelistAppendHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
// 创建查询白名单规则
|
||||
Method: http.MethodPost,
|
||||
Path: "/create",
|
||||
Handler: admin_query_whitelist.AdminQueryWhitelistCreateHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
// 查询白名单操作记录列表
|
||||
Method: http.MethodGet,
|
||||
Path: "/op-log/list",
|
||||
Handler: admin_query_whitelist.AdminQueryWhitelistOpLogListHandler(serverCtx),
|
||||
},
|
||||
}...,
|
||||
),
|
||||
rest.WithPrefix("/api/v1/admin/query-whitelist"),
|
||||
)
|
||||
|
||||
server.AddRoutes(
|
||||
rest.WithMiddlewares(
|
||||
[]rest.Middleware{serverCtx.AdminAuthInterceptor},
|
||||
@@ -851,13 +879,13 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/app/version",
|
||||
Handler: app.GetAppVersionHandler(serverCtx),
|
||||
Path: "/app/home/dynamic",
|
||||
Handler: app.GetHomeDynamicDataHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/app/home/dynamic",
|
||||
Handler: app.GetHomeDynamicDataHandler(serverCtx),
|
||||
Path: "/app/version",
|
||||
Handler: app.GetAppVersionHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
// 心跳检测接口
|
||||
@@ -945,12 +973,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
|
||||
},
|
||||
{
|
||||
Method: http.MethodGet,
|
||||
Path: "/pay/xpay/push",
|
||||
Handler: pay.XpayPushHandler(serverCtx),
|
||||
},
|
||||
{
|
||||
Method: http.MethodPost,
|
||||
Path: "/pay/xpay/push",
|
||||
Path: "/pay/xpay/pushpost/pay/xpay/push",
|
||||
Handler: pay.XpayPushHandler(serverCtx),
|
||||
},
|
||||
},
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
package admin_query_whitelist
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
tianyuanapi "qnc-server/app/main/api/internal/service/tianyuanapi_sdk"
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type AdminQueryWhitelistAppendLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewAdminQueryWhitelistAppendLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminQueryWhitelistAppendLogic {
|
||||
return &AdminQueryWhitelistAppendLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *AdminQueryWhitelistAppendLogic) AdminQueryWhitelistAppend(req *types.AdminQueryWhitelistAppendReq) (resp *types.AdminQueryWhitelistOpResp, err error) {
|
||||
createReq := &types.AdminQueryWhitelistCreateReq{
|
||||
Name: req.Name,
|
||||
IdCard: req.IdCard,
|
||||
ApiCodes: req.ApiCodes,
|
||||
Remark: req.Remark,
|
||||
}
|
||||
return executeQueryWhitelistOp(l.ctx, l.svcCtx, "append", createReq, func(client *tianyuanapi.Client, payload tianyuanapi.QueryWhitelistRequest) *tianyuanapi.QueryWhitelistResult {
|
||||
return client.AppendQueryWhitelistEntry(payload)
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package admin_query_whitelist
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
tianyuanapi "qnc-server/app/main/api/internal/service/tianyuanapi_sdk"
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
type AdminQueryWhitelistCreateLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewAdminQueryWhitelistCreateLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminQueryWhitelistCreateLogic {
|
||||
return &AdminQueryWhitelistCreateLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *AdminQueryWhitelistCreateLogic) AdminQueryWhitelistCreate(req *types.AdminQueryWhitelistCreateReq) (resp *types.AdminQueryWhitelistOpResp, err error) {
|
||||
return executeQueryWhitelistOp(l.ctx, l.svcCtx, "create", req, func(client *tianyuanapi.Client, payload tianyuanapi.QueryWhitelistRequest) *tianyuanapi.QueryWhitelistResult {
|
||||
return client.CreateQueryWhitelistEntry(payload)
|
||||
})
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package admin_query_whitelist
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
"qnc-server/app/main/model"
|
||||
"qnc-server/common/globalkey"
|
||||
"qnc-server/common/xerr"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
"github.com/zeromicro/go-zero/core/mr"
|
||||
)
|
||||
|
||||
type AdminQueryWhitelistOpLogListLogic struct {
|
||||
logx.Logger
|
||||
ctx context.Context
|
||||
svcCtx *svc.ServiceContext
|
||||
}
|
||||
|
||||
func NewAdminQueryWhitelistOpLogListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminQueryWhitelistOpLogListLogic {
|
||||
return &AdminQueryWhitelistOpLogListLogic{
|
||||
Logger: logx.WithContext(ctx),
|
||||
ctx: ctx,
|
||||
svcCtx: svcCtx,
|
||||
}
|
||||
}
|
||||
|
||||
func (l *AdminQueryWhitelistOpLogListLogic) AdminQueryWhitelistOpLogList(req *types.AdminQueryWhitelistOpLogListReq) (resp *types.AdminQueryWhitelistOpLogListResp, err error) {
|
||||
builder := l.svcCtx.QueryWhitelistOpLogModel.SelectBuilder().
|
||||
Where("del_state = ?", globalkey.DelStateNo)
|
||||
|
||||
if req.IdCard != nil && *req.IdCard != "" {
|
||||
builder = builder.Where("id_card = ?", *req.IdCard)
|
||||
}
|
||||
if req.Action != nil && *req.Action != "" {
|
||||
builder = builder.Where("action = ?", *req.Action)
|
||||
}
|
||||
if req.TianyuanCode != nil {
|
||||
builder = builder.Where("tianyuan_code = ?", *req.TianyuanCode)
|
||||
}
|
||||
|
||||
var total int64
|
||||
var logs []*model.QueryWhitelistOpLog
|
||||
err = mr.Finish(func() error {
|
||||
count, countErr := l.svcCtx.QueryWhitelistOpLogModel.FindCount(l.ctx, builder, "id")
|
||||
if countErr != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询操作记录总数失败: %v", countErr)
|
||||
}
|
||||
total = count
|
||||
return nil
|
||||
}, func() error {
|
||||
list, listErr := l.svcCtx.QueryWhitelistOpLogModel.FindPageListByPage(l.ctx, builder, req.Page, req.PageSize, "create_time DESC")
|
||||
if listErr != nil {
|
||||
return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询操作记录列表失败: %v", listErr)
|
||||
}
|
||||
logs = list
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
resp = &types.AdminQueryWhitelistOpLogListResp{
|
||||
Total: total,
|
||||
Items: make([]types.AdminQueryWhitelistOpLogItem, 0, len(logs)),
|
||||
}
|
||||
for _, log := range logs {
|
||||
resp.Items = append(resp.Items, buildOpLogListItem(l.ctx, l.svcCtx, log))
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
141
app/main/api/internal/logic/admin_query_whitelist/op_helper.go
Normal file
141
app/main/api/internal/logic/admin_query_whitelist/op_helper.go
Normal file
@@ -0,0 +1,141 @@
|
||||
package admin_query_whitelist
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
|
||||
"qnc-server/app/main/api/internal/svc"
|
||||
"qnc-server/app/main/api/internal/types"
|
||||
tianyuanapi "qnc-server/app/main/api/internal/service/tianyuanapi_sdk"
|
||||
"qnc-server/app/main/model"
|
||||
"qnc-server/common/ctxdata"
|
||||
"qnc-server/common/xerr"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
func executeQueryWhitelistOp(
|
||||
ctx context.Context,
|
||||
svcCtx *svc.ServiceContext,
|
||||
action string,
|
||||
req *types.AdminQueryWhitelistCreateReq,
|
||||
callFn func(client *tianyuanapi.Client, payload tianyuanapi.QueryWhitelistRequest) *tianyuanapi.QueryWhitelistResult,
|
||||
) (*types.AdminQueryWhitelistOpResp, error) {
|
||||
adminUserId, err := ctxdata.GetUidFromCtx(ctx)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.TOKEN_EXPIRE_ERROR), "获取管理员信息失败: %v", err)
|
||||
}
|
||||
|
||||
if svcCtx.TianyuanapiClient == nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "天远API客户端未初始化")
|
||||
}
|
||||
|
||||
name := req.Name
|
||||
if name == "" {
|
||||
name = "*"
|
||||
}
|
||||
|
||||
payload := tianyuanapi.QueryWhitelistRequest{
|
||||
Name: name,
|
||||
IdCard: req.IdCard,
|
||||
ApiCodes: req.ApiCodes,
|
||||
Remark: req.Remark,
|
||||
}
|
||||
|
||||
result := callFn(svcCtx.TianyuanapiClient, payload)
|
||||
|
||||
apiCodesJSON, _ := json.Marshal(req.ApiCodes)
|
||||
opLog := &model.QueryWhitelistOpLog{
|
||||
AdminUserId: adminUserId,
|
||||
Action: action,
|
||||
Name: name,
|
||||
IdCard: req.IdCard,
|
||||
ApiCodes: string(apiCodesJSON),
|
||||
TianyuanCode: int64(result.Code),
|
||||
}
|
||||
if req.Remark != "" {
|
||||
opLog.Remark = sql.NullString{String: req.Remark, Valid: true}
|
||||
}
|
||||
if result.Message != "" {
|
||||
opLog.TianyuanMessage = sql.NullString{String: result.Message, Valid: true}
|
||||
}
|
||||
if result.TransactionID != "" {
|
||||
opLog.TransactionId = sql.NullString{String: result.TransactionID, Valid: true}
|
||||
}
|
||||
if result.Entry != nil {
|
||||
opLog.IdCardMasked = sql.NullString{String: result.Entry.IdCardMasked, Valid: result.Entry.IdCardMasked != ""}
|
||||
opLog.EntryId = sql.NullString{String: result.Entry.Id, Valid: result.Entry.Id != ""}
|
||||
opLog.EntryStatus = sql.NullString{String: result.Entry.Status, Valid: result.Entry.Status != ""}
|
||||
if len(result.Entry.ApiCodes) > 0 {
|
||||
entryApiCodesJSON, _ := json.Marshal(result.Entry.ApiCodes)
|
||||
opLog.EntryApiCodes = sql.NullString{String: string(entryApiCodesJSON), Valid: true}
|
||||
}
|
||||
}
|
||||
|
||||
if _, insertErr := svcCtx.QueryWhitelistOpLogModel.Insert(ctx, nil, opLog); insertErr != nil {
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "保存操作记录失败: %v", insertErr)
|
||||
}
|
||||
|
||||
resp := &types.AdminQueryWhitelistOpResp{
|
||||
TianyuanCode: result.Code,
|
||||
TianyuanMessage: result.Message,
|
||||
TransactionId: result.TransactionID,
|
||||
}
|
||||
if result.Entry != nil {
|
||||
resp.Entry = &types.AdminQueryWhitelistEntryItem{
|
||||
Id: result.Entry.Id,
|
||||
Name: result.Entry.Name,
|
||||
IdCardMasked: result.Entry.IdCardMasked,
|
||||
ApiCodes: result.Entry.ApiCodes,
|
||||
Status: result.Entry.Status,
|
||||
Remark: result.Entry.Remark,
|
||||
CreatedAt: result.Entry.CreatedAt,
|
||||
UpdatedAt: result.Entry.UpdatedAt,
|
||||
}
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
func buildOpLogListItem(ctx context.Context, svcCtx *svc.ServiceContext, log *model.QueryWhitelistOpLog) types.AdminQueryWhitelistOpLogItem {
|
||||
item := types.AdminQueryWhitelistOpLogItem{
|
||||
Id: log.Id,
|
||||
AdminUserId: log.AdminUserId,
|
||||
Action: log.Action,
|
||||
Name: log.Name,
|
||||
IdCard: log.IdCard,
|
||||
IdCardMasked: log.IdCardMasked.String,
|
||||
Remark: log.Remark.String,
|
||||
TianyuanCode: int(log.TianyuanCode),
|
||||
TianyuanMessage: log.TianyuanMessage.String,
|
||||
TransactionId: log.TransactionId.String,
|
||||
EntryId: log.EntryId.String,
|
||||
EntryStatus: log.EntryStatus.String,
|
||||
CreateTime: log.CreateTime.Format("2006-01-02 15:04:05"),
|
||||
}
|
||||
|
||||
if log.ApiCodes != "" {
|
||||
var apiCodes []string
|
||||
if json.Unmarshal([]byte(log.ApiCodes), &apiCodes) == nil {
|
||||
item.ApiCodes = apiCodes
|
||||
}
|
||||
}
|
||||
if log.EntryApiCodes.Valid && log.EntryApiCodes.String != "" {
|
||||
var entryApiCodes []string
|
||||
if json.Unmarshal([]byte(log.EntryApiCodes.String), &entryApiCodes) == nil {
|
||||
item.EntryApiCodes = entryApiCodes
|
||||
}
|
||||
}
|
||||
|
||||
if log.AdminUserId != "" {
|
||||
if adminUser, err := svcCtx.AdminUserModel.FindOne(ctx, log.AdminUserId); err == nil {
|
||||
item.AdminUserName = adminUser.RealName
|
||||
if item.AdminUserName == "" {
|
||||
item.AdminUserName = adminUser.Username
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return item
|
||||
}
|
||||
@@ -58,19 +58,21 @@ type ApiCallOptions struct {
|
||||
|
||||
// Client 天元API客户端
|
||||
type Client struct {
|
||||
accessID string
|
||||
key string
|
||||
baseURL string
|
||||
timeout time.Duration
|
||||
client *http.Client
|
||||
accessID string
|
||||
key string
|
||||
baseURL string
|
||||
whitelistMgmtKey string
|
||||
timeout time.Duration
|
||||
client *http.Client
|
||||
}
|
||||
|
||||
// Config 客户端配置
|
||||
type Config struct {
|
||||
AccessID string // 访问ID
|
||||
Key string // AES密钥(16进制)
|
||||
BaseURL string // API基础URL
|
||||
Timeout time.Duration // 超时时间
|
||||
AccessID string // 访问ID
|
||||
Key string // AES密钥(16进制)
|
||||
BaseURL string // API基础URL
|
||||
WhitelistMgmtKey string // 查询白名单管理密钥
|
||||
Timeout time.Duration // 超时时间
|
||||
}
|
||||
|
||||
// Request 请求参数
|
||||
@@ -122,10 +124,11 @@ func NewClient(config Config) (*Client, error) {
|
||||
}
|
||||
|
||||
return &Client{
|
||||
accessID: config.AccessID,
|
||||
key: config.Key,
|
||||
baseURL: config.BaseURL,
|
||||
timeout: config.Timeout,
|
||||
accessID: config.AccessID,
|
||||
key: config.Key,
|
||||
baseURL: config.BaseURL,
|
||||
whitelistMgmtKey: config.WhitelistMgmtKey,
|
||||
timeout: config.Timeout,
|
||||
client: &http.Client{
|
||||
Timeout: config.Timeout,
|
||||
},
|
||||
|
||||
148
app/main/api/internal/service/tianyuanapi_sdk/query_whitelist.go
Normal file
148
app/main/api/internal/service/tianyuanapi_sdk/query_whitelist.go
Normal file
@@ -0,0 +1,148 @@
|
||||
package tianyuanapi
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
// QueryWhitelistRequest 查询白名单请求参数(加密前明文)
|
||||
type QueryWhitelistRequest struct {
|
||||
Name string `json:"name"`
|
||||
IdCard string `json:"id_card"`
|
||||
ApiCodes []string `json:"api_codes"`
|
||||
Remark string `json:"remark,omitempty"`
|
||||
}
|
||||
|
||||
// QueryWhitelistEntry 查询白名单规则(解密后 data)
|
||||
type QueryWhitelistEntry struct {
|
||||
Id string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
IdCardMasked string `json:"id_card_masked"`
|
||||
ApiCodes []string `json:"api_codes"`
|
||||
Status string `json:"status"`
|
||||
Remark string `json:"remark"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
}
|
||||
|
||||
// QueryWhitelistResult 查询白名单接口调用结果(保留天远原始业务码)
|
||||
type QueryWhitelistResult struct {
|
||||
Code int `json:"code"`
|
||||
Message string `json:"message"`
|
||||
TransactionID string `json:"transaction_id"`
|
||||
Entry *QueryWhitelistEntry `json:"entry,omitempty"`
|
||||
RequestError string `json:"request_error,omitempty"`
|
||||
}
|
||||
|
||||
// CreateQueryWhitelistEntry 创建查询白名单规则
|
||||
func (c *Client) CreateQueryWhitelistEntry(req QueryWhitelistRequest) *QueryWhitelistResult {
|
||||
return c.callQueryWhitelist("query-whitelist/entries", req)
|
||||
}
|
||||
|
||||
// AppendQueryWhitelistEntry 向已有规则追加产品编码
|
||||
func (c *Client) AppendQueryWhitelistEntry(req QueryWhitelistRequest) *QueryWhitelistResult {
|
||||
return c.callQueryWhitelist("query-whitelist/entries/append", req)
|
||||
}
|
||||
|
||||
func (c *Client) callQueryWhitelist(path string, payload QueryWhitelistRequest) *QueryWhitelistResult {
|
||||
if c.whitelistMgmtKey == "" {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1010,
|
||||
Message: "缺少管理密钥",
|
||||
}
|
||||
}
|
||||
|
||||
jsonData, err := json.Marshal(payload)
|
||||
if err != nil {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1001,
|
||||
Message: "接口异常",
|
||||
RequestError: fmt.Sprintf("参数序列化失败: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
encryptedData, err := c.encrypt(string(jsonData))
|
||||
if err != nil {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1001,
|
||||
Message: "接口异常",
|
||||
RequestError: fmt.Sprintf("数据加密失败: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
requestBody := map[string]interface{}{
|
||||
"data": encryptedData,
|
||||
}
|
||||
requestBodyBytes, err := json.Marshal(requestBody)
|
||||
if err != nil {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1001,
|
||||
Message: "接口异常",
|
||||
RequestError: fmt.Sprintf("请求体序列化失败: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
url := fmt.Sprintf("%s/api/v1/%s", c.baseURL, path)
|
||||
httpReq, err := http.NewRequest("POST", url, bytes.NewBuffer(requestBodyBytes))
|
||||
if err != nil {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1001,
|
||||
Message: "接口异常",
|
||||
RequestError: fmt.Sprintf("创建HTTP请求失败: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
httpReq.Header.Set("Content-Type", "application/json")
|
||||
httpReq.Header.Set("Access-Id", c.accessID)
|
||||
httpReq.Header.Set("Whitelist-Mgmt-Key", c.whitelistMgmtKey)
|
||||
httpReq.Header.Set("User-Agent", "TianyuanAPI-Go-SDK/1.0.0")
|
||||
|
||||
resp, err := c.client.Do(httpReq)
|
||||
if err != nil {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1001,
|
||||
Message: "接口异常",
|
||||
RequestError: err.Error(),
|
||||
}
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
body, err := io.ReadAll(resp.Body)
|
||||
if err != nil {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1001,
|
||||
Message: "接口异常",
|
||||
RequestError: fmt.Sprintf("读取响应失败: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
var apiResp ApiResponse
|
||||
if err := json.Unmarshal(body, &apiResp); err != nil {
|
||||
return &QueryWhitelistResult{
|
||||
Code: 1001,
|
||||
Message: "接口异常",
|
||||
RequestError: fmt.Sprintf("响应解析失败: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
result := &QueryWhitelistResult{
|
||||
Code: apiResp.Code,
|
||||
Message: apiResp.Message,
|
||||
TransactionID: apiResp.TransactionID,
|
||||
}
|
||||
|
||||
if apiResp.Data != "" {
|
||||
decryptedData, err := c.decrypt(apiResp.Data)
|
||||
if err == nil {
|
||||
var entry QueryWhitelistEntry
|
||||
if json.Unmarshal([]byte(decryptedData), &entry) == nil {
|
||||
result.Entry = &entry
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
@@ -83,9 +83,11 @@ type ServiceContext struct {
|
||||
GlobalNotificationsModel model.GlobalNotificationsModel
|
||||
AuthorizationDocumentModel model.AuthorizationDocumentModel
|
||||
InquiryRecordModel model.InquiryRecordModel
|
||||
QueryWhitelistOpLogModel model.QueryWhitelistOpLogModel
|
||||
|
||||
// 第三方服务
|
||||
TianyuanapiCallLogService *service.TianyuanapiCallLogService
|
||||
TianyuanapiClient *tianyuanapi.Client
|
||||
|
||||
// 服务
|
||||
AlipayService *service.AliPayService
|
||||
@@ -175,14 +177,16 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
globalNotificationsModel := model.NewGlobalNotificationsModel(db, cacheConf)
|
||||
authorizationDocumentModel := model.NewAuthorizationDocumentModel(db, cacheConf)
|
||||
inquiryRecordModel := model.NewInquiryRecordModel(db, cacheConf)
|
||||
queryWhitelistOpLogModel := model.NewQueryWhitelistOpLogModel(db, cacheConf)
|
||||
tianyuanapiCallLogModel := model.NewTianyuanapiCallLogModel(db, cacheConf)
|
||||
|
||||
// ============================== 第三方服务初始化 ==============================
|
||||
tianyuanapi, err := tianyuanapi.NewClient(tianyuanapi.Config{
|
||||
AccessID: c.Tianyuanapi.AccessID,
|
||||
Key: c.Tianyuanapi.Key,
|
||||
BaseURL: c.Tianyuanapi.BaseURL,
|
||||
Timeout: time.Duration(c.Tianyuanapi.Timeout) * time.Second,
|
||||
AccessID: c.Tianyuanapi.AccessID,
|
||||
Key: c.Tianyuanapi.Key,
|
||||
BaseURL: c.Tianyuanapi.BaseURL,
|
||||
WhitelistMgmtKey: c.Tianyuanapi.WhitelistMgmtKey,
|
||||
Timeout: time.Duration(c.Tianyuanapi.Timeout) * time.Second,
|
||||
})
|
||||
if err != nil {
|
||||
logx.Errorf("初始化天远API失败: %+v", err)
|
||||
@@ -302,9 +306,11 @@ func NewServiceContext(c config.Config) *ServiceContext {
|
||||
GlobalNotificationsModel: globalNotificationsModel,
|
||||
AuthorizationDocumentModel: authorizationDocumentModel,
|
||||
InquiryRecordModel: inquiryRecordModel,
|
||||
QueryWhitelistOpLogModel: queryWhitelistOpLogModel,
|
||||
|
||||
// 第三方服务
|
||||
TianyuanapiCallLogService: tianyuanapiCallLogService,
|
||||
TianyuanapiClient: tianyuanapi,
|
||||
|
||||
// 服务
|
||||
AlipayService: alipayService,
|
||||
|
||||
@@ -230,6 +230,10 @@ type AdminGenerateDiamondInviteCodeResp struct {
|
||||
Codes []string `json:"codes"` // 生成的邀请码列表
|
||||
}
|
||||
|
||||
type AdminGenerateQueryShareLinkReq struct {
|
||||
OrderId string `json:"order_id"`
|
||||
}
|
||||
|
||||
type AdminGetAgentCommissionListReq struct {
|
||||
Page int64 `form:"page"` // 页码
|
||||
PageSize int64 `form:"pageSize"` // 每页数量
|
||||
@@ -676,10 +680,6 @@ type AdminGetQueryDetailByOrderIdReq struct {
|
||||
OrderId string `path:"order_id"`
|
||||
}
|
||||
|
||||
type AdminGenerateQueryShareLinkReq struct {
|
||||
OrderId string `json:"order_id"`
|
||||
}
|
||||
|
||||
type AdminGetQueryDetailByOrderIdResp struct {
|
||||
Id string `json:"id"` // 主键ID
|
||||
OrderId string `json:"order_id"` // 订单ID
|
||||
@@ -776,6 +776,70 @@ type AdminQueryItem struct {
|
||||
Data interface{} `json:"data"` // 这里可以是 map 或 具体的 struct
|
||||
}
|
||||
|
||||
type AdminQueryWhitelistAppendReq struct {
|
||||
Name string `json:"name"` // 姓名,* 表示仅按身份证匹配
|
||||
IdCard string `json:"id_card"` // 身份证号
|
||||
ApiCodes []string `json:"api_codes"` // 产品编码列表
|
||||
Remark string `json:"remark,optional"` // 备注
|
||||
}
|
||||
|
||||
type AdminQueryWhitelistCreateReq struct {
|
||||
Name string `json:"name"` // 姓名,* 表示仅按身份证匹配
|
||||
IdCard string `json:"id_card"` // 身份证号
|
||||
ApiCodes []string `json:"api_codes"` // 产品编码列表
|
||||
Remark string `json:"remark,optional"` // 备注
|
||||
}
|
||||
|
||||
type AdminQueryWhitelistEntryItem struct {
|
||||
Id string `json:"id"`
|
||||
Name string `json:"name"`
|
||||
IdCardMasked string `json:"id_card_masked"`
|
||||
ApiCodes []string `json:"api_codes"`
|
||||
Status string `json:"status"`
|
||||
Remark string `json:"remark"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
UpdatedAt string `json:"updated_at"`
|
||||
}
|
||||
|
||||
type AdminQueryWhitelistOpLogItem struct {
|
||||
Id string `json:"id"`
|
||||
AdminUserId string `json:"admin_user_id"`
|
||||
AdminUserName string `json:"admin_user_name"`
|
||||
Action string `json:"action"`
|
||||
Name string `json:"name"`
|
||||
IdCard string `json:"id_card"`
|
||||
IdCardMasked string `json:"id_card_masked"`
|
||||
ApiCodes []string `json:"api_codes"`
|
||||
Remark string `json:"remark"`
|
||||
TianyuanCode int `json:"tianyuan_code"`
|
||||
TianyuanMessage string `json:"tianyuan_message"`
|
||||
TransactionId string `json:"transaction_id"`
|
||||
EntryId string `json:"entry_id"`
|
||||
EntryStatus string `json:"entry_status"`
|
||||
EntryApiCodes []string `json:"entry_api_codes"`
|
||||
CreateTime string `json:"create_time"`
|
||||
}
|
||||
|
||||
type AdminQueryWhitelistOpLogListReq struct {
|
||||
Page int64 `form:"page,default=1"`
|
||||
PageSize int64 `form:"page_size,default=20"`
|
||||
IdCard *string `form:"id_card,optional"` // 身份证号
|
||||
Action *string `form:"action,optional"` // create / append
|
||||
TianyuanCode *int64 `form:"tianyuan_code,optional"` // 天远业务码,0=成功
|
||||
}
|
||||
|
||||
type AdminQueryWhitelistOpLogListResp struct {
|
||||
Total int64 `json:"total"`
|
||||
Items []AdminQueryWhitelistOpLogItem `json:"items"`
|
||||
}
|
||||
|
||||
type AdminQueryWhitelistOpResp struct {
|
||||
TianyuanCode int `json:"tianyuan_code"` // 天远业务码
|
||||
TianyuanMessage string `json:"tianyuan_message"` // 天远返回描述
|
||||
TransactionId string `json:"transaction_id,optional"` // 天远流水号
|
||||
Entry *AdminQueryWhitelistEntryItem `json:"entry,optional"` // 成功时规则详情
|
||||
}
|
||||
|
||||
type AdminRefundOrderReq struct {
|
||||
Id string `path:"id"` // 订单ID
|
||||
RefundAmount float64 `json:"refund_amount"` // 退款金额
|
||||
@@ -816,18 +880,6 @@ type AdminRetryAgentProcessResp struct {
|
||||
ProcessedAt string `json:"processed_at"` // 处理时间
|
||||
}
|
||||
|
||||
type AdminXpayDeliverReq struct {
|
||||
Id string `path:"id"` // 订单ID
|
||||
}
|
||||
|
||||
type AdminXpayDeliverResp struct {
|
||||
Credited bool `json:"credited"`
|
||||
Notified bool `json:"notified"`
|
||||
WechatDetail string `json:"wechat_detail"`
|
||||
Errors []string `json:"errors"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
type AdminRevenueStatistics struct {
|
||||
TodayAmount float64 `json:"today_amount"` // 今日营收
|
||||
MonthAmount float64 `json:"month_amount"` // 当月营收
|
||||
@@ -1034,6 +1086,18 @@ type AdminUserListItem struct {
|
||||
RoleIds []string `json:"role_ids"` // 关联的角色ID列表
|
||||
}
|
||||
|
||||
type AdminXpayDeliverReq struct {
|
||||
Id string `path:"id"` // 订单ID
|
||||
}
|
||||
|
||||
type AdminXpayDeliverResp struct {
|
||||
Credited bool `json:"credited"`
|
||||
Notified bool `json:"notified"`
|
||||
WechatDetail string `json:"wechat_detail"`
|
||||
Errors []string `json:"errors"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
|
||||
type AgentApplyReq struct {
|
||||
Region string `json:"region,optional"`
|
||||
Mobile string `json:"mobile"`
|
||||
@@ -1764,6 +1828,13 @@ type IapCallbackReq struct {
|
||||
TransactionReceipt string `json:"transaction_receipt" validate:"required"`
|
||||
}
|
||||
|
||||
type InquiryRecordItem struct {
|
||||
Id int64 `json:"id"`
|
||||
Tag string `json:"tag"`
|
||||
Vin string `json:"vin"`
|
||||
Model string `json:"model"`
|
||||
}
|
||||
|
||||
type InviteCodeItem struct {
|
||||
Id string `json:"id"` // 记录ID
|
||||
Code string `json:"code"` // 邀请码
|
||||
@@ -1935,25 +2006,6 @@ type PaymentCheckResp struct {
|
||||
WxOrderDetail string `json:"wx_order_detail,optional"` // query_order 原始 order 摘要(排查用)
|
||||
}
|
||||
|
||||
type XpayClientEventReq struct {
|
||||
OrderNo string `json:"order_no,optional"`
|
||||
Stage string `json:"stage" validate:"required"` // prepay_ok, invoke, success, fail, check
|
||||
EventType string `json:"event_type" validate:"required,oneof=info tip fail success"`
|
||||
Message string `json:"message,optional"` // 微信/Apple 展示给用户的话术
|
||||
ErrMsg string `json:"err_msg,optional"`
|
||||
ErrCode int `json:"err_code,optional"`
|
||||
Errno int `json:"errno,optional"`
|
||||
SignData string `json:"sign_data,optional"`
|
||||
Device string `json:"device,optional"`
|
||||
Extra string `json:"extra,optional"`
|
||||
}
|
||||
|
||||
type XpayClientEventResp struct {
|
||||
WxOrderStatus int `json:"wx_order_status,optional"`
|
||||
WxOrderDetail string `json:"wx_order_detail,optional"`
|
||||
WxSyncError string `json:"wx_sync_error,optional"`
|
||||
}
|
||||
|
||||
type PaymentReq struct {
|
||||
Id string `json:"id"`
|
||||
PayMethod string `json:"pay_method"` // 支付方式: wechat, alipay, appleiap, test(仅开发环境), test_empty(仅开发环境-空报告模式)
|
||||
@@ -2226,6 +2278,11 @@ type RegisterByInviteCodeResp struct {
|
||||
AgentCode int64 `json:"agent_code"`
|
||||
}
|
||||
|
||||
type ReviewItem struct {
|
||||
Name string `json:"name"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
type RoleListItem struct {
|
||||
Id string `json:"id"` // 角色ID
|
||||
RoleName string `json:"role_name"` // 角色名称
|
||||
@@ -2460,6 +2517,25 @@ type WithdrawalItem struct {
|
||||
CreateTime string `json:"create_time"` // 创建时间
|
||||
}
|
||||
|
||||
type XpayClientEventReq struct {
|
||||
OrderNo string `json:"order_no,optional"`
|
||||
Stage string `json:"stage" validate:"required"` // prepay_ok, invoke, success, fail, check
|
||||
EventType string `json:"event_type" validate:"required,oneof=info tip fail success"`
|
||||
Message string `json:"message,optional"` // 微信/Apple 展示给用户的话术(非 HTTP 报错)
|
||||
ErrMsg string `json:"err_msg,optional"`
|
||||
ErrCode int `json:"err_code,optional"`
|
||||
Errno int `json:"errno,optional"`
|
||||
SignData string `json:"sign_data,optional"`
|
||||
Device string `json:"device,optional"`
|
||||
Extra string `json:"extra,optional"`
|
||||
}
|
||||
|
||||
type XpayClientEventResp struct {
|
||||
WxOrderStatus int `json:"wx_order_status,optional"`
|
||||
WxOrderDetail string `json:"wx_order_detail,optional"`
|
||||
WxSyncError string `json:"wx_sync_error,optional"`
|
||||
}
|
||||
|
||||
type GetAppConfigResp struct {
|
||||
QueryRetentionDays int64 `json:"query_retention_days"`
|
||||
}
|
||||
@@ -2469,29 +2545,17 @@ type GetAppVersionResp struct {
|
||||
WgtUrl string `json:"wgtUrl"`
|
||||
}
|
||||
|
||||
type SendSmsReq struct {
|
||||
Mobile string `json:"mobile" validate:"required,mobile"`
|
||||
ActionType string `json:"actionType" validate:"required,oneof=login register query agentApply realName bindMobile"`
|
||||
CaptchaVerifyParam string `json:"captchaVerifyParam,optional"`
|
||||
}
|
||||
|
||||
type GetHomeDynamicDataReq struct {
|
||||
LastId int64 `form:"lastId,optional"`
|
||||
}
|
||||
|
||||
type InquiryRecordItem struct {
|
||||
Id int64 `json:"id"`
|
||||
Tag string `json:"tag"`
|
||||
Vin string `json:"vin"`
|
||||
Model string `json:"model"`
|
||||
}
|
||||
|
||||
type ReviewItem struct {
|
||||
Name string `json:"name"`
|
||||
Content string `json:"content"`
|
||||
}
|
||||
|
||||
type GetHomeDynamicDataResp struct {
|
||||
Cases []InquiryRecordItem `json:"cases"`
|
||||
Reviews []ReviewItem `json:"reviews"`
|
||||
}
|
||||
|
||||
type SendSmsReq struct {
|
||||
Mobile string `json:"mobile" validate:"required,mobile"`
|
||||
ActionType string `json:"actionType" validate:"required,oneof=login register query agentApply realName bindMobile"`
|
||||
CaptchaVerifyParam string `json:"captchaVerifyParam,optional"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user