diff --git a/app/main/api/desc/front/agent.api b/app/main/api/desc/front/agent.api index 87fa65a..733e1d7 100644 --- a/app/main/api/desc/front/agent.api +++ b/app/main/api/desc/front/agent.api @@ -619,11 +619,13 @@ type ( List []PromotionQueryItem `json:"list"` // 列表 } PromotionQueryItem { - Id string `json:"id"` // 查询ID - OrderId string `json:"order_id"` // 订单ID - ProductName string `json:"product_name"` // 产品名称 - CreateTime string `json:"create_time"` // 创建时间 - QueryState string `json:"query_state"` // 查询状态 + Id string `json:"id"` // 查询ID + OrderId string `json:"order_id"` // 订单ID + ProductName string `json:"product_name"` // 产品名称 + CreateTime string `json:"create_time"` // 创建时间 + QueryState string `json:"query_state"` // 查询状态 + Params map[string]interface{} `json:"params"` // 查询参数(已脱敏) + Price float64 `json:"price"` // 查询价格 } // ============================================ // 用户模块白名单相关类型 diff --git a/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go b/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go index 36edbe9..50d1456 100644 --- a/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go +++ b/app/main/api/internal/logic/agent/getpromotionquerylistlogic.go @@ -6,6 +6,11 @@ import ( "bdqr-server/common/globalkey" "bdqr-server/common/xerr" "context" + "encoding/hex" + "encoding/json" + "strings" + + "bdqr-server/pkg/lzkit/crypto" "github.com/jinzhu/copier" "github.com/pkg/errors" @@ -47,7 +52,7 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti builder := l.svcCtx.AgentOrderModel.SelectBuilder(). Where("agent_id = ? AND del_state = ?", agent.Id, globalkey.DelStateNo) - orders, total, err := l.svcCtx.AgentOrderModel.FindPageListByPageWithTotal(l.ctx, builder, req.Page, req.PageSize, "create_time DESC") + orders, _, err := l.svcCtx.AgentOrderModel.FindPageListByPageWithTotal(l.ctx, builder, req.Page, req.PageSize, "create_time DESC") if err != nil { return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理订单失败, %v", err) } @@ -71,6 +76,34 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询产品信息失败, %v", pErr) } + // 获取订单价格 + order, oErr := l.svcCtx.OrderModel.FindOne(l.ctx, ao.OrderId) + if oErr != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询订单信息失败, %v", oErr) + } + + // 解密并脱敏params + var params map[string]interface{} + if q.QueryParams != "" { + secretKey := l.svcCtx.Config.Encrypt.SecretKey + key, decodeErr := hex.DecodeString(secretKey) + if decodeErr != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取AES密钥失败, %v", decodeErr) + } + decryptedData, decryptErr := crypto.AesDecrypt(q.QueryParams, key) + if decryptErr != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "解密查询参数失败, %v", decryptErr) + } + unmarshalErr := json.Unmarshal(decryptedData, ¶ms) + if unmarshalErr != nil { + return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "解析查询参数失败, %v", unmarshalErr) + } + // 脱敏处理 + params = l.desensitizeParams(params) + } else { + params = make(map[string]interface{}) + } + item := types.PromotionQueryItem{} _ = copier.Copy(&item, q) item.Id = q.Id @@ -78,11 +111,74 @@ func (l *GetPromotionQueryListLogic) GetPromotionQueryList(req *types.GetPromoti item.ProductName = product.ProductName item.CreateTime = q.CreateTime.Format("2006-01-02 15:04:05") item.QueryState = q.QueryState + item.Params = params + item.Price = order.Amount list = append(list, item) } return &types.GetPromotionQueryListResp{ - Total: total, // 前端仅展示已创建查询条目 + Total: int64(len(list)), // 仅统计已创建查询的条目 List: list, }, nil } + +// desensitizeParams 对敏感数据进行脱敏处理 +func (l *GetPromotionQueryListLogic) desensitizeParams(params map[string]interface{}) map[string]interface{} { + result := make(map[string]interface{}) + for key, value := range params { + if strValue, ok := value.(string); ok { + keyLower := strings.ToLower(key) + if (strings.Contains(keyLower, "name") || strings.Contains(keyLower, "姓名")) && len(strValue) > 0 { + result[key] = l.maskName(strValue) + } else if (strings.Contains(keyLower, "idcard") || strings.Contains(keyLower, "id_card") || strings.Contains(keyLower, "身份证")) && len(strValue) > 10 { + result[key] = l.maskIDCard(strValue) + } else if (strings.Contains(keyLower, "mobile") || strings.Contains(keyLower, "phone") || strings.Contains(keyLower, "手机")) && len(strValue) >= 8 { + result[key] = l.maskPhone(strValue) + } else { + result[key] = strValue + } + } else { + result[key] = value + } + } + return result +} + +// maskName 姓名脱敏 +func (l *GetPromotionQueryListLogic) maskName(name string) string { + runes := []rune(name) + length := len(runes) + if length <= 1 { + return name + } + if length == 2 { + return string(runes[0]) + "*" + } + return string(runes[0]) + strings.Repeat("*", length-2) + string(runes[length-1]) +} + +// maskIDCard 身份证号脱敏 +func (l *GetPromotionQueryListLogic) maskIDCard(idCard string) string { + length := len(idCard) + if length <= 10 { + return idCard + } + // 保留前3位和后4位 + if length > 7 { + return idCard[:3] + strings.Repeat("*", length-7) + idCard[length-4:] + } + return idCard +} + +// maskPhone 手机号脱敏 +func (l *GetPromotionQueryListLogic) maskPhone(phone string) string { + length := len(phone) + if length < 8 { + return phone + } + // 保留前3位和后4位 + if length > 7 { + return phone[:3] + strings.Repeat("*", length-7) + phone[length-4:] + } + return phone +} diff --git a/app/main/api/internal/types/types.go b/app/main/api/internal/types/types.go index 83ea578..e35447a 100644 --- a/app/main/api/internal/types/types.go +++ b/app/main/api/internal/types/types.go @@ -1895,11 +1895,13 @@ type ProductResponse struct { } type PromotionQueryItem struct { - Id string `json:"id"` // 查询ID - OrderId string `json:"order_id"` // 订单ID - ProductName string `json:"product_name"` // 产品名称 - CreateTime string `json:"create_time"` // 创建时间 - QueryState string `json:"query_state"` // 查询状态 + Id string `json:"id"` // 查询ID + OrderId string `json:"order_id"` // 订单ID + ProductName string `json:"product_name"` // 产品名称 + CreateTime string `json:"create_time"` // 创建时间 + QueryState string `json:"query_state"` // 查询状态 + Params map[string]interface{} `json:"params"` // 查询参数(已脱敏) + Price float64 `json:"price"` // 查询价格 } type Query struct {