Merge branch 'v3' into test
This commit is contained in:
commit
65de970292
|
|
@ -73,14 +73,4 @@ default_prompt:
|
||||||
user_prompt: '识别图片内容'
|
user_prompt: '识别图片内容'
|
||||||
# 权限配置
|
# 权限配置
|
||||||
permissionConfig:
|
permissionConfig:
|
||||||
# 不同系统的权限校验配置
|
permission_url: "http://api.test.user.1688sup.cn:8001/v1/menu/myCodes?systemId="
|
||||||
sys_permission:
|
|
||||||
# 直连天下系统
|
|
||||||
zltx:
|
|
||||||
permission_url: "https://gateway.dev.cdlsxd.cn/zltx_api/test/v1/menu/myCodes?systemCode=zltx"
|
|
||||||
white_list:
|
|
||||||
- "knowledge_qa" # 知识问答
|
|
||||||
# 通用的白名单接口
|
|
||||||
white_list:
|
|
||||||
- "chat" # 聊天接口
|
|
||||||
- "bug_optimization_submit" # 优化建议提交接口
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,9 @@ import (
|
||||||
"ai_scheduler/internal/pkg"
|
"ai_scheduler/internal/pkg"
|
||||||
"ai_scheduler/tmpl/dataTemp"
|
"ai_scheduler/tmpl/dataTemp"
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
@ -71,6 +73,11 @@ func (d *Do) DataAuth(ctx context.Context, client *gateway.Client, requireData *
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 6. 加载用户权限
|
||||||
|
if _, err = d.LoadUserPermission(client, requireData); err != nil {
|
||||||
|
return fmt.Errorf("获取用户权限失败: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -298,3 +305,51 @@ func sendWithTimeout(c *websocket.Conn, data entitys.Response, timeout time.Dura
|
||||||
return sendCtx.Err()
|
return sendCtx.Err()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 从统一登录平台获取用户权限
|
||||||
|
func (d *Do) LoadUserPermission(client *gateway.Client, requireData *entitys.RequireData) (codes []string, err error) {
|
||||||
|
if len(client.GetCodes()) > 0 {
|
||||||
|
return client.GetCodes(), nil
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
request l_request.Request
|
||||||
|
)
|
||||||
|
|
||||||
|
// 构建请求URL
|
||||||
|
request.Url = d.conf.PermissionConfig.PermissionURL + strconv.Itoa(int(requireData.Sys.SysID))
|
||||||
|
|
||||||
|
request.Method = "GET"
|
||||||
|
request.Headers = map[string]string{
|
||||||
|
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
|
||||||
|
"Accept": "application/json, text/plain, */*",
|
||||||
|
"Authorization": "Bearer " + client.GetAuth(),
|
||||||
|
}
|
||||||
|
|
||||||
|
// 发送请求
|
||||||
|
res, err := request.Send()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查响应状态码
|
||||||
|
if res.StatusCode != http.StatusOK {
|
||||||
|
err = errors.SysErr("获取用户权限失败")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
type resp struct {
|
||||||
|
Codes []string `json:"codes"`
|
||||||
|
}
|
||||||
|
// 解析响应体
|
||||||
|
var respBody resp
|
||||||
|
err = json.Unmarshal([]byte(res.Text), &respBody)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置客户端权限
|
||||||
|
client.SetCodes(respBody.Codes)
|
||||||
|
|
||||||
|
return respBody.Codes, nil
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,9 +17,8 @@ import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
|
||||||
|
|
||||||
"gorm.io/gorm/utils"
|
"gorm.io/gorm/utils"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Handle struct {
|
type Handle struct {
|
||||||
|
|
@ -265,18 +264,6 @@ func (r *Handle) handleApiTask(ctx context.Context, requireData *entitys.Require
|
||||||
|
|
||||||
// 权限验证
|
// 权限验证
|
||||||
func (r *Handle) PermissionAuth(client *gateway.Client, pointTask *model.AiTask) (err error) {
|
func (r *Handle) PermissionAuth(client *gateway.Client, pointTask *model.AiTask) (err error) {
|
||||||
// 通用权限校验
|
|
||||||
if utils.Contains(r.conf.PermissionConfig.WhiteList, pointTask.Index) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// 系统权限校验
|
|
||||||
if v, ok := r.conf.PermissionConfig.SysPermission[client.GetSysCode()]; !ok {
|
|
||||||
return fmt.Errorf("未配置系统权限校验: %s", client.GetSysCode())
|
|
||||||
} else if utils.Contains(v.WhiteList, pointTask.Index) {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// 授权检查权限
|
// 授权检查权限
|
||||||
if !utils.Contains(client.GetCodes(), pointTask.Index) {
|
if !utils.Contains(client.GetCodes(), pointTask.Index) {
|
||||||
return fmt.Errorf("用户权限不足: %s", pointTask.Name)
|
return fmt.Errorf("用户权限不足: %s", pointTask.Name)
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,16 @@
|
||||||
package biz
|
package biz
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
errors "ai_scheduler/internal/data/error"
|
||||||
"ai_scheduler/internal/data/impl"
|
"ai_scheduler/internal/data/impl"
|
||||||
"ai_scheduler/internal/data/model"
|
"ai_scheduler/internal/data/model"
|
||||||
"ai_scheduler/internal/entitys"
|
"ai_scheduler/internal/entitys"
|
||||||
|
"ai_scheduler/internal/pkg/l_request"
|
||||||
"context"
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"gorm.io/gorm/utils"
|
||||||
|
"net/http"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
"xorm.io/builder"
|
"xorm.io/builder"
|
||||||
|
|
||||||
|
|
@ -24,12 +30,66 @@ func NewTaskBiz(conf *config.Config, taskRepo *impl.TaskImpl) *TaskBiz {
|
||||||
}
|
}
|
||||||
|
|
||||||
// taskList 功能列表
|
// taskList 功能列表
|
||||||
func (t *TaskBiz) TaskList(ctx context.Context, req *entitys.TaskRequest) (list []model.AiTask, err error) {
|
func (t *TaskBiz) TaskList(ctx context.Context, req *entitys.TaskRequest, auth string) (list []model.AiTask, err error) {
|
||||||
|
tasks := make([]model.AiTask, 0)
|
||||||
cond := builder.NewCond()
|
cond := builder.NewCond()
|
||||||
cond = cond.And(builder.Eq{"status": 1})
|
cond = cond.And(builder.Eq{"status": 1})
|
||||||
|
|
||||||
cond = cond.And(builder.Eq{"sys_id": req.SysId})
|
cond = cond.And(builder.Eq{"sys_id": req.SysId})
|
||||||
err = t.taskRepo.GetRangeToMapStruct(&cond, &list)
|
err = t.taskRepo.GetRangeToMapStruct(&cond, &tasks)
|
||||||
|
|
||||||
|
codes, err := t.GetUserPermission(req, auth)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查用户是否有权限
|
||||||
|
for _, task := range tasks {
|
||||||
|
if utils.Contains(codes, task.Index) {
|
||||||
|
list = append(list, task)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 从统一登录平台获取用户权限
|
||||||
|
func (t *TaskBiz) GetUserPermission(req *entitys.TaskRequest, auth string) (codes []string, err error) {
|
||||||
|
var (
|
||||||
|
request l_request.Request
|
||||||
|
)
|
||||||
|
|
||||||
|
// 构建请求URL
|
||||||
|
request.Url = t.conf.PermissionConfig.PermissionURL + strconv.Itoa(int(req.SysId))
|
||||||
|
|
||||||
|
request.Method = "GET"
|
||||||
|
request.Headers = map[string]string{
|
||||||
|
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
|
||||||
|
"Accept": "application/json, text/plain, */*",
|
||||||
|
"Authorization": auth,
|
||||||
|
}
|
||||||
|
|
||||||
|
// 发送请求
|
||||||
|
res, err := request.Send()
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查响应状态码
|
||||||
|
if res.StatusCode != http.StatusOK {
|
||||||
|
err = errors.SysErr("获取用户权限失败")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
type resp struct {
|
||||||
|
Codes []string `json:"codes"`
|
||||||
|
}
|
||||||
|
// 解析响应体
|
||||||
|
var respBody resp
|
||||||
|
err = json.Unmarshal([]byte(res.Text), &respBody)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
return respBody.Codes, nil
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -118,22 +118,10 @@ type LoggingConfig struct {
|
||||||
|
|
||||||
// PermissionConfig 权限校验配置
|
// PermissionConfig 权限校验配置
|
||||||
type PermissionConfig struct {
|
type PermissionConfig struct {
|
||||||
// 不同系统的权限校验配置
|
|
||||||
SysPermission map[string]SysWhiteList `mapstructure:"sys_permission"`
|
|
||||||
// 通用的白名单任务列表,不需要权限校验
|
|
||||||
WhiteList []string `mapstructure:"white_list"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// 细分系统的白名单任务列表
|
|
||||||
type SysWhiteList struct {
|
|
||||||
// 获取权限的地址
|
// 获取权限的地址
|
||||||
PermissionURL string `mapstructure:"permission_url"`
|
PermissionURL string `mapstructure:"permission_url"`
|
||||||
// 系统的白名单任务列表
|
|
||||||
WhiteList []string `mapstructure:"white_list"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 权限校验配置
|
|
||||||
|
|
||||||
// LoadConfig 加载配置
|
// LoadConfig 加载配置
|
||||||
func LoadConfig(configPath string) (*Config, error) {
|
func LoadConfig(configPath string) (*Config, error) {
|
||||||
viper.SetConfigFile(configPath)
|
viper.SetConfigFile(configPath)
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,10 @@ import (
|
||||||
"ai_scheduler/internal/biz"
|
"ai_scheduler/internal/biz"
|
||||||
"ai_scheduler/internal/config"
|
"ai_scheduler/internal/config"
|
||||||
"ai_scheduler/internal/data/constants"
|
"ai_scheduler/internal/data/constants"
|
||||||
errors "ai_scheduler/internal/data/error"
|
|
||||||
"ai_scheduler/internal/entitys"
|
"ai_scheduler/internal/entitys"
|
||||||
"ai_scheduler/internal/gateway"
|
"ai_scheduler/internal/gateway"
|
||||||
"ai_scheduler/internal/pkg/l_request"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
|
|
@ -92,15 +89,6 @@ func (h *ChatService) Chat(c *websocket.Conn) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取用户权限
|
|
||||||
codes, err := h.GetUserPermission(client)
|
|
||||||
if err != nil {
|
|
||||||
log.Println("获取用户权限错误:", err)
|
|
||||||
h.ChatFail(c, err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
client.SetCodes(codes)
|
|
||||||
|
|
||||||
// 确保在函数返回时移除客户端并关闭连接
|
// 确保在函数返回时移除客户端并关闭连接
|
||||||
defer func() {
|
defer func() {
|
||||||
h.Gw.RemoveClient(client.GetID())
|
h.Gw.RemoveClient(client.GetID())
|
||||||
|
|
@ -192,52 +180,3 @@ func (s *ChatService) UsefulList(c *fiber.Ctx) error {
|
||||||
|
|
||||||
return c.JSON(constants.UseFulMap)
|
return c.JSON(constants.UseFulMap)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 从统一登录平台获取用户权限
|
|
||||||
func (s *ChatService) GetUserPermission(client *gateway.Client) (codes []string, err error) {
|
|
||||||
var (
|
|
||||||
request l_request.Request
|
|
||||||
)
|
|
||||||
|
|
||||||
// 系统编码
|
|
||||||
systemCode := client.GetSysCode()
|
|
||||||
|
|
||||||
// 检查系统编码是否配置
|
|
||||||
if v, ok := s.cfg.PermissionConfig.SysPermission[systemCode]; !ok {
|
|
||||||
err = errors.SysErr("系统编码 %s 未配置", systemCode)
|
|
||||||
return
|
|
||||||
} else {
|
|
||||||
request.Url = v.PermissionURL
|
|
||||||
}
|
|
||||||
|
|
||||||
request.Method = "GET"
|
|
||||||
request.Headers = map[string]string{
|
|
||||||
"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
|
|
||||||
"Accept": "application/json, text/plain, */*",
|
|
||||||
"Authorization": "Bearer " + client.GetAuth(),
|
|
||||||
}
|
|
||||||
|
|
||||||
// 发送请求
|
|
||||||
res, err := request.Send()
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// 检查响应状态码
|
|
||||||
if res.StatusCode != http.StatusOK {
|
|
||||||
err = errors.SysErr("获取用户权限失败")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
type resp struct {
|
|
||||||
Codes []string `json:"codes"`
|
|
||||||
}
|
|
||||||
// 解析响应体
|
|
||||||
var respBody resp
|
|
||||||
err = json.Unmarshal([]byte(res.Text), &respBody)
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
return respBody.Codes, nil
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@ package services
|
||||||
import (
|
import (
|
||||||
"ai_scheduler/internal/biz"
|
"ai_scheduler/internal/biz"
|
||||||
"ai_scheduler/internal/entitys"
|
"ai_scheduler/internal/entitys"
|
||||||
|
|
||||||
"github.com/gofiber/fiber/v2"
|
"github.com/gofiber/fiber/v2"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -25,7 +24,15 @@ func (s *TaskService) Tasks(c *fiber.Ctx) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := s.taskBiz.TaskList(c.Context(), req)
|
auth := ""
|
||||||
|
if auths := c.GetReqHeaders()["Authorization"]; len(auths) > 0 {
|
||||||
|
auth = auths[0]
|
||||||
|
}
|
||||||
|
if auth == "" {
|
||||||
|
return fiber.ErrUnauthorized
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := s.taskBiz.TaskList(c.Context(), req, auth)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"ai_scheduler/internal/entitys"
|
"ai_scheduler/internal/entitys"
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ZltxOrderAfterSaleResellerTool struct {
|
type ZltxOrderAfterSaleResellerTool struct {
|
||||||
|
|
@ -22,7 +23,7 @@ func (t *ZltxOrderAfterSaleResellerTool) Name() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *ZltxOrderAfterSaleResellerTool) Description() string {
|
func (t *ZltxOrderAfterSaleResellerTool) Description() string {
|
||||||
return "直连天下上游供应商售后工具"
|
return "直连天下下游分销商普充订单售后工具"
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *ZltxOrderAfterSaleResellerTool) Definition() entitys.ToolDefinition {
|
func (t *ZltxOrderAfterSaleResellerTool) Definition() entitys.ToolDefinition {
|
||||||
|
|
@ -31,18 +32,18 @@ func (t *ZltxOrderAfterSaleResellerTool) Definition() entitys.ToolDefinition {
|
||||||
Function: entitys.FunctionDef{
|
Function: entitys.FunctionDef{
|
||||||
Name: t.Name(),
|
Name: t.Name(),
|
||||||
Description: t.Description(),
|
Description: t.Description(),
|
||||||
Parameters: map[string]interface{}{
|
Parameters: map[string]interface{}{
|
||||||
"type": "object",
|
// "type": "object",
|
||||||
"properties": map[string]interface{}{
|
// "properties": map[string]interface{}{
|
||||||
"orderType": map[string]interface{}{
|
// "orderType": map[string]interface{}{
|
||||||
"type": "integer",
|
// "type": "integer",
|
||||||
"description": "售后订单类型",
|
// "description": "售后订单类型",
|
||||||
},
|
// },
|
||||||
"orderNumber": map[string]interface{}{
|
// "orderNumber": map[string]interface{}{
|
||||||
"type": "string",
|
// "type": "string",
|
||||||
"description": "售后订单号",
|
// "description": "售后订单号",
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
// "required": []string{"orderType", "orderNumber"},
|
// "required": []string{"orderType", "orderNumber"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -50,13 +51,15 @@ func (t *ZltxOrderAfterSaleResellerTool) Definition() entitys.ToolDefinition {
|
||||||
}
|
}
|
||||||
|
|
||||||
type ZltxOrderAfterSaleResellerRequest struct {
|
type ZltxOrderAfterSaleResellerRequest struct {
|
||||||
OrderNumber string `json:"orderNumber"` // 订单号
|
OrderNumber []string `json:"orderNumber"` // 订单号
|
||||||
SerialNumber string `json:"serialNumber"` // 流水号
|
Account string `json:"account"` // 充值账号
|
||||||
Account string `json:"account"` // 充值账号
|
OrderTimeStart string `json:"orderTimeStart"` // 订单执行开始时间
|
||||||
OrderTimeStart string `json:"orderTimeStart"` // 订单执行开始时间
|
OrderTimeEnd string `json:"orderTimeEnd"` // 订单执行结束时间
|
||||||
OrderTimeEnd string `json:"orderTimeEnd"` // 订单执行结束时间
|
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
||||||
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
||||||
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
||||||
|
ResponsibleType int `json:"responsibleType"` // 费用承担者 1.供应商 2.商务 3.公司 4.无
|
||||||
|
ResponsiblePerson string `json:"responsiblePerson"` // 费用承担供应商
|
||||||
}
|
}
|
||||||
|
|
||||||
type ZltxOrderAfterSaleResellerResponse struct {
|
type ZltxOrderAfterSaleResellerResponse struct {
|
||||||
|
|
@ -91,13 +94,13 @@ func (t *ZltxOrderAfterSaleResellerTool) Execute(ctx context.Context, requireDat
|
||||||
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// if req.OrderNumber == "" {
|
if len(req.OrderNumber) == 0 && (req.Account == "" || req.OrderTimeStart == "") {
|
||||||
// return fmt.Errorf("orderType and orderNumber are required")
|
return fmt.Errorf("订单号 和 充值账号&订单执行时间 不能同时为空")
|
||||||
// }
|
}
|
||||||
return t.checkZltxOrderAfterSaleReseller(req.OrderNumber, requireData)
|
return t.checkZltxOrderAfterSaleReseller(req, requireData)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *ZltxOrderAfterSaleResellerTool) checkZltxOrderAfterSaleReseller(orderNumber string, requireData *entitys.RequireData) error {
|
func (t *ZltxOrderAfterSaleResellerTool) checkZltxOrderAfterSaleReseller(req ZltxOrderAfterSaleResellerRequest, requireData *entitys.RequireData) error {
|
||||||
// req := l_request.Request{
|
// req := l_request.Request{
|
||||||
// Url: t.config.BaseURL,
|
// Url: t.config.BaseURL,
|
||||||
// Headers: map[string]string{
|
// Headers: map[string]string{
|
||||||
|
|
@ -121,6 +124,8 @@ func (t *ZltxOrderAfterSaleResellerTool) checkZltxOrderAfterSaleReseller(orderNu
|
||||||
// if resp.Code != 0 {
|
// if resp.Code != 0 {
|
||||||
// return fmt.Errorf("check failed: %s", resp.Msg)
|
// return fmt.Errorf("check failed: %s", resp.Msg)
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
// === mock start ===
|
||||||
resp := ZltxOrderAfterSaleResellerResponse{
|
resp := ZltxOrderAfterSaleResellerResponse{
|
||||||
Code: 0,
|
Code: 0,
|
||||||
Msg: "success",
|
Msg: "success",
|
||||||
|
|
@ -165,6 +170,12 @@ func (t *ZltxOrderAfterSaleResellerTool) checkZltxOrderAfterSaleReseller(orderNu
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(req.OrderNumber) == 1 {
|
||||||
|
resp.Data = resp.Data[:1]
|
||||||
|
}
|
||||||
|
// === mock end ===
|
||||||
|
|
||||||
jsonByte, err := json.Marshal(resp)
|
jsonByte, err := json.Marshal(resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,182 @@
|
||||||
|
package tools
|
||||||
|
|
||||||
|
import (
|
||||||
|
"ai_scheduler/internal/config"
|
||||||
|
"ai_scheduler/internal/entitys"
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ZltxOrderAfterSaleResellerBatchTool struct {
|
||||||
|
config config.ToolConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewZltxOrderAfterSaleResellerBatchTool 创建售后订单预检工具
|
||||||
|
func NewZltxOrderAfterSaleResellerBatchTool(config config.ToolConfig) *ZltxOrderAfterSaleResellerBatchTool {
|
||||||
|
return &ZltxOrderAfterSaleResellerBatchTool{config: config}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Name 返回工具名称
|
||||||
|
func (t *ZltxOrderAfterSaleResellerBatchTool) Name() string {
|
||||||
|
return "zltxOrderAfterSaleResellerBatch"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *ZltxOrderAfterSaleResellerBatchTool) Description() string {
|
||||||
|
return "直连天下下游分销商批充订单售后工具"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *ZltxOrderAfterSaleResellerBatchTool) Definition() entitys.ToolDefinition {
|
||||||
|
return entitys.ToolDefinition{
|
||||||
|
Type: "function",
|
||||||
|
Function: entitys.FunctionDef{
|
||||||
|
Name: t.Name(),
|
||||||
|
Description: t.Description(),
|
||||||
|
Parameters: map[string]interface{}{
|
||||||
|
// "type": "object",
|
||||||
|
// "properties": map[string]interface{}{
|
||||||
|
// "orderType": map[string]interface{}{
|
||||||
|
// "type": "integer",
|
||||||
|
// "description": "售后订单类型",
|
||||||
|
// },
|
||||||
|
// "orderNumber": map[string]interface{}{
|
||||||
|
// "type": "string",
|
||||||
|
// "description": "售后订单号",
|
||||||
|
// },
|
||||||
|
// },
|
||||||
|
// "required": []string{"orderType", "orderNumber"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
type ZltxOrderAfterSaleResellerBatchRequest struct {
|
||||||
|
OrderNumber []string `json:"orderNumber"` // 订单号
|
||||||
|
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
||||||
|
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
||||||
|
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
||||||
|
ResponsibleType int `json:"responsibleType"` // 费用承担者 1.供应商 2.商务 3.公司 4.无
|
||||||
|
ResponsiblePerson string `json:"responsiblePerson"` // 费用承担供应商
|
||||||
|
}
|
||||||
|
|
||||||
|
type ZltxOrderAfterSaleResellerBatchResponse struct {
|
||||||
|
Code int `json:"code"`
|
||||||
|
Msg string `json:"msg"`
|
||||||
|
Data []ZltxOrderAfterSaleResellerBatchData `json:"data"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type ZltxOrderAfterSaleResellerBatchData struct {
|
||||||
|
OrderType int `json:"orderType"`
|
||||||
|
OrderNumber string `json:"orderNumber"`
|
||||||
|
OrderAmount float64 `json:"orderAmount"`
|
||||||
|
OrderPrice float64 `json:"orderPrice"`
|
||||||
|
SignCompany int `json:"signCompany"`
|
||||||
|
OrderQuantity int `json:"orderQuantity"`
|
||||||
|
ResellerID int `json:"resellerId"`
|
||||||
|
ResellerName string `json:"resellerName"`
|
||||||
|
OurProductID int `json:"ourProductId"`
|
||||||
|
OurProductTitle string `json:"ourProductTitle"`
|
||||||
|
Account []string `json:"account"`
|
||||||
|
Platforms map[int]string `json:"platforms"`
|
||||||
|
AfterType int `json:"afterType"` // 处理方式 1.退款 2.扣款
|
||||||
|
Remark string `json:"remark"` // 售后原因
|
||||||
|
AfterAmount float64 `json:"afterAmount"` // 售后金额
|
||||||
|
ResponsibleType int `json:"responsibleType"` // 费用承担者 1.供应商 2.商务 3.公司 4.无
|
||||||
|
ResponsiblePerson string `json:"responsiblePerson"` // 费用承担供应商
|
||||||
|
IsExistsAfterSale bool `json:"isExistsAfterSale"` // 是否已存在售后
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *ZltxOrderAfterSaleResellerBatchTool) Execute(ctx context.Context, requireData *entitys.RequireData) error {
|
||||||
|
var req ZltxOrderAfterSaleResellerBatchRequest
|
||||||
|
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if len(req.OrderNumber) == 0 {
|
||||||
|
return fmt.Errorf("批充订单号不能为空")
|
||||||
|
}
|
||||||
|
return t.checkZltxOrderAfterSaleResellerBatch(req, requireData)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (t *ZltxOrderAfterSaleResellerBatchTool) checkZltxOrderAfterSaleResellerBatch(req ZltxOrderAfterSaleResellerBatchRequest, requireData *entitys.RequireData) error {
|
||||||
|
// req := l_request.Request{
|
||||||
|
// Url: t.config.BaseURL,
|
||||||
|
// Headers: map[string]string{
|
||||||
|
// "Authorization": fmt.Sprintf("Bearer %s", requireData.Auth),
|
||||||
|
// },
|
||||||
|
// Method: "POST",
|
||||||
|
// Data: map[string]string{
|
||||||
|
// // "orderType": fmt.Sprintf("%d", orderType),
|
||||||
|
// "orderNumber": orderNumber,
|
||||||
|
// },
|
||||||
|
// }
|
||||||
|
// res, err := req.Send()
|
||||||
|
// if err != nil {
|
||||||
|
// return err
|
||||||
|
// }
|
||||||
|
// // 解析响应
|
||||||
|
// var resp ZltxOrderAfterSaleResellerBatchResponse
|
||||||
|
// if err := json.Unmarshal(res.Content, &resp); err != nil {
|
||||||
|
// return err
|
||||||
|
// }
|
||||||
|
// if resp.Code != 0 {
|
||||||
|
// return fmt.Errorf("check failed: %s", resp.Msg)
|
||||||
|
// }
|
||||||
|
|
||||||
|
// === mock start ===
|
||||||
|
resp := ZltxOrderAfterSaleResellerBatchResponse{
|
||||||
|
Code: 0,
|
||||||
|
Msg: "success",
|
||||||
|
Data: []ZltxOrderAfterSaleResellerBatchData{
|
||||||
|
{
|
||||||
|
OrderType: 1,
|
||||||
|
OrderNumber: "846784115378364417",
|
||||||
|
OrderAmount: 0.1,
|
||||||
|
OrderPrice: 0.1,
|
||||||
|
SignCompany: 1,
|
||||||
|
OrderQuantity: 1,
|
||||||
|
ResellerID: 23329,
|
||||||
|
ResellerName: "分销商23329",
|
||||||
|
OurProductID: 106,
|
||||||
|
OurProductTitle: "爱奇艺黄金会员周卡",
|
||||||
|
Account: []string{"15516353308"},
|
||||||
|
Platforms: map[int]string{4: "爱奇艺"},
|
||||||
|
AfterType: 1,
|
||||||
|
Remark: "测试售后",
|
||||||
|
AfterAmount: 50,
|
||||||
|
ResponsibleType: 1,
|
||||||
|
IsExistsAfterSale: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
OrderType: 101,
|
||||||
|
OrderNumber: "846052057729867777",
|
||||||
|
OrderAmount: 23,
|
||||||
|
OrderPrice: 23,
|
||||||
|
SignCompany: 1,
|
||||||
|
OrderQuantity: 1,
|
||||||
|
ResellerID: 25629,
|
||||||
|
ResellerName: "二期财务分销商简称",
|
||||||
|
OurProductID: 104,
|
||||||
|
OurProductTitle: "优酷年卡",
|
||||||
|
Account: []string{"18380416326"},
|
||||||
|
Platforms: map[int]string{1: "爱瓦力"},
|
||||||
|
AfterType: 2,
|
||||||
|
Remark: "测试售后2",
|
||||||
|
AfterAmount: 30,
|
||||||
|
ResponsibleType: 2,
|
||||||
|
IsExistsAfterSale: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(req.OrderNumber) == 1 {
|
||||||
|
resp.Data = resp.Data[:1]
|
||||||
|
}
|
||||||
|
// === mock end ===
|
||||||
|
|
||||||
|
jsonByte, err := json.Marshal(resp)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
entitys.ResJson(requireData.Ch, t.Name(), string(jsonByte))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
@ -5,6 +5,7 @@ import (
|
||||||
"ai_scheduler/internal/entitys"
|
"ai_scheduler/internal/entitys"
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ZltxOrderAfterSaleSupplierTool struct {
|
type ZltxOrderAfterSaleSupplierTool struct {
|
||||||
|
|
@ -50,13 +51,13 @@ func (t *ZltxOrderAfterSaleSupplierTool) Definition() entitys.ToolDefinition {
|
||||||
}
|
}
|
||||||
|
|
||||||
type ZltxOrderAfterSaleSupplierRequest struct {
|
type ZltxOrderAfterSaleSupplierRequest struct {
|
||||||
OrderNumber string `json:"orderNumber"` // 订单号
|
SerialNumber []string `json:"serialNumber"` // 流水号
|
||||||
SerialNumber string `json:"serialNumber"` // 流水号
|
Account string `json:"account"` // 充值账号
|
||||||
Account string `json:"account"` // 充值账号
|
OrderTimeStart string `json:"orderTimeStart"` // 订单执行开始时间
|
||||||
OrderTimeStart string `json:"orderTimeStart"` // 订单执行开始时间
|
OrderTimeEnd string `json:"orderTimeEnd"` // 订单执行结束时间
|
||||||
OrderTimeEnd string `json:"orderTimeEnd"` // 订单执行结束时间
|
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
||||||
AfterSalesReason string `json:"afterSalesReason"` // 售后原因
|
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
||||||
AfterSalesPrice string `json:"afterSalesPrice"` // 售后金额
|
AfterType int `json:"afterType"` // 售后类型 1.加款 2.扣款
|
||||||
}
|
}
|
||||||
|
|
||||||
type ZltxOrderAfterSaleSupplierResponse struct {
|
type ZltxOrderAfterSaleSupplierResponse struct {
|
||||||
|
|
@ -88,13 +89,13 @@ func (t *ZltxOrderAfterSaleSupplierTool) Execute(ctx context.Context, requireDat
|
||||||
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
if err := json.Unmarshal([]byte(requireData.Match.Parameters), &req); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// if req.OrderNumber == "" {
|
if len(req.SerialNumber) == 0 && (req.Account == "" || req.OrderTimeStart == "") {
|
||||||
// return fmt.Errorf("orderType and orderNumber are required")
|
return fmt.Errorf("充值流水号 和 充值账号&订单执行时间 不能同时为空")
|
||||||
// }
|
}
|
||||||
return t.checkZltxOrderAfterSaleSupplier(req.OrderNumber, requireData)
|
return t.checkZltxOrderAfterSaleSupplier(req, requireData)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (t *ZltxOrderAfterSaleSupplierTool) checkZltxOrderAfterSaleSupplier(orderNumber string, requireData *entitys.RequireData) error {
|
func (t *ZltxOrderAfterSaleSupplierTool) checkZltxOrderAfterSaleSupplier(req ZltxOrderAfterSaleSupplierRequest, requireData *entitys.RequireData) error {
|
||||||
// req := l_request.Request{
|
// req := l_request.Request{
|
||||||
// Url: t.config.BaseURL,
|
// Url: t.config.BaseURL,
|
||||||
// Headers: map[string]string{
|
// Headers: map[string]string{
|
||||||
|
|
@ -118,23 +119,12 @@ func (t *ZltxOrderAfterSaleSupplierTool) checkZltxOrderAfterSaleSupplier(orderNu
|
||||||
// if resp.Code != 0 {
|
// if resp.Code != 0 {
|
||||||
// return fmt.Errorf("check failed: %s", resp.Msg)
|
// return fmt.Errorf("check failed: %s", resp.Msg)
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
// === mock start ===
|
||||||
resp := ZltxOrderAfterSaleSupplierResponse{
|
resp := ZltxOrderAfterSaleSupplierResponse{
|
||||||
Code: 0,
|
Code: 0,
|
||||||
Msg: "success",
|
Msg: "success",
|
||||||
Data: []ZltxOrderAfterSaleSupplierData{
|
Data: []ZltxOrderAfterSaleSupplierData{
|
||||||
// {
|
|
||||||
// "serialNumber": "847465394004430849",
|
|
||||||
// "platformName": "爱奇艺",
|
|
||||||
// "signCompany": 1,
|
|
||||||
// "platformProductName": "爱奇艺官方周卡",
|
|
||||||
// "platformPrice": 6,
|
|
||||||
// "terminalAccount": "15516353308",
|
|
||||||
// "status": 1,
|
|
||||||
// "platformProductId": 2,
|
|
||||||
// "platformId": 4,
|
|
||||||
// "signCompanyName": "成都蓝色兄弟网络科技有限公司",
|
|
||||||
// "executeTime": 1763961931
|
|
||||||
// }
|
|
||||||
{
|
{
|
||||||
SerialNumber: "847465394004430849",
|
SerialNumber: "847465394004430849",
|
||||||
PlatformName: "爱奇艺",
|
PlatformName: "爱奇艺",
|
||||||
|
|
@ -171,6 +161,12 @@ func (t *ZltxOrderAfterSaleSupplierTool) checkZltxOrderAfterSaleSupplier(orderNu
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if len(req.SerialNumber) == 1 {
|
||||||
|
resp.Data = resp.Data[:1]
|
||||||
|
}
|
||||||
|
// === mock end ===
|
||||||
|
|
||||||
jsonByte, err := json.Marshal(resp)
|
jsonByte, err := json.Marshal(resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue