Merge branch 'feature/rzy/bug_optimization_submit_and_order_search'

fix: 优化负利润分析和缓存处理逻辑
2026-01-19 16:45:42 +08:00 · 2026-01-19 16:45:21 +08:00 · 2026-01-19 15:32:45 +08:00
21 changed files with 325 additions and 76 deletions
--- a/config/config_test.yaml
+++ b/config/config_test.yaml
@ -4,10 +4,10 @@ server:
  host: "0.0.0.0"

 ollama:
-  base_url: "http://127.0.0.1:11434"
-  model: "qwen3-coder:480b-cloud"
-  generate_model: "qwen3-coder:480b-cloud"
-  mapping_model: "deepseek-v3.2:cloud"
+  base_url: "http://192.168.6.115:11434"
+  model: "qwen3:8b"
+  generate_model: "qwen3:8b"
+  mapping_model: "qwen3:8b"
  vl_model: "gemini-3-pro-preview"
  timeout: "120s"
  level: "info"
@ -26,11 +26,11 @@ coze:

 lsxd:
  # 统一登录
-  login_url: "https://api.user.1688sup.com/v1/login/phone"
-  phone: "ORlviZN7N06W2+WKLe76xg=="
-  password: "V5Uh8C4bamEM6UQZh4TCeQ=="
-  code: "456789"
-  check_token_url: "https://api.user.1688sup.com/v1/user/welcome"
+  login_url: "http://api.test.user.1688sup.com/v1/login/phone"
+  phone: "OFJ8UpqOlI7+w3Qklf36ZA=="
+  password: "tEbFegH/DRRh6LutFb7o3g=="
+  code: "123456"
+  check_token_url: "http://api.test.user.1688sup.com/v1/user/welcome"


 sys:
@ -43,7 +43,7 @@ redis:
  host: 47.97.27.195:6379
  type: node
  pass: lansexiongdi@666
-  key: ai_scheduler-test
+  key: ai_scheduler_test
  pollSize: 5 #连接池大小，不配置，或配置为0表示不启用连接池
  minIdleConns: 2 #最小空闲连接数
  maxIdleTime: 30 #每个连接最大空闲时间，如果超过了这个时间会被关闭
--- a/internal/biz/ding_talk_bot.go
+++ b/internal/biz/ding_talk_bot.go
@ -9,6 +9,7 @@ import (
 	"ai_scheduler/internal/data/impl"
 	"ai_scheduler/internal/data/model"
 	"ai_scheduler/internal/entitys"
+	"ai_scheduler/internal/pkg"
 	"ai_scheduler/internal/tools"
 	"ai_scheduler/internal/tools/bbxt"
 	"ai_scheduler/tmpl/dataTemp"
@ -223,11 +224,16 @@ func (d *DingTalkBotBiz) recognize(ctx context.Context, requireData *entitys.Req

 			rec.Tasks = append(rec.Tasks, entitys.RegistrationTask{
 				Name:             task.Index,
-				Desc:             task.Desc,
+				Desc:             task.TempPrompt,
 				TaskConfigDetail: taskConfig, // 直接使用解析后的配置，避免重复构建
 			})
 		}
 	}
+
+	rec.Ext = pkg.JsonByteIgonErr(&entitys.TaskExt{
+		UserName: requireData.Req.SenderNick,
+	})
+
 	err = d.handle.Recognize(ctx, rec, &do.WithDingTalkBot{})
 	return
 }
@ -393,7 +399,7 @@ func (d *DingTalkBotBiz) defaultPrompt() string {
 - 注意区分 parameters 中的 必须参数（required） 和 可选参数（optional），按下述参数提取规则处理。
 - 若**完全无法匹配**，立即设置 is_match: false，并在 chat 中已第一人称的角度提醒用户需要适用何种工具（例："请问您是要查询订单还是商品呢"）。

-1. **参数提取**：
+3. **参数提取**：

 - 根据 parameters 字段列出的参数名，从用户输入中提取对应值。
 - **仅提取**明确提及的参数，忽略未列出的内容。
--- a/internal/biz/do/handle.go
+++ b/internal/biz/do/handle.go
@ -133,7 +133,9 @@ func (r *Handle) HandleMatch(ctx context.Context, client *gateway.Client, rec *e
 	case constants.TaskTypeFunc:
 		return r.handleTask(ctx, rec, pointTask)
 	case constants.TaskTypeBot:
-		return r.handleBot(ctx, rec, pointTask)
+		return r.HandleBot(ctx, rec, &entitys.Task{
+			Index: pointTask.Index,
+		})
 	case constants.TaskTypeEinoWorkflow:
 		return r.handleEinoWorkflow(ctx, rec, pointTask)
 	case constants.TaskTypeCozeWorkflow:
@ -247,23 +249,34 @@ func (r *Handle) handleKnowle(ctx context.Context, rec *entitys.Recognize, task
 }

 // bot 临时实现，后续转到 eino 工作流
-func (r *Handle) handleBot(ctx context.Context, rec *entitys.Recognize, task *model.AiTask) (err error) {
+func (r *Handle) HandleBot(ctx context.Context, rec *entitys.Recognize, task *entitys.Task) (err error) {
 	if task.Index == "bug_optimization_submit" {
-		entitys.ResLoading(rec.Ch, task.Index, "需求记录中...")
-
-		// Ext 中获取 sessionId
-		sessionID := rec.GetSession()
+		var unionId string
+		entitys.ResLoading(rec.Ch, task.Index, "需求记录中...\n")
 		// 获取dingtalk accessToken
 		accessToken, _ := r.dingtalkOldClient.GetAccessToken()
-		// 获取创建者 dingtalk unionId
-		unionId := r.getUserDingtalkUnionId(ctx, accessToken, sessionID)
+		// Ext 中获取 sessionId
+		taskExt := rec.GetTaskExt()
+		if taskExt == nil {
+			return errorcode.ParamErr("taskExt参数错误")
+		}
+		if len(taskExt.Session) > 0 {
+			// 获取创建者 dingtalk unionId
+			unionId = r.getUserDingtalkUnionId(ctx, accessToken, taskExt.Session)
+		} else if len(taskExt.UserName) > 0 {
+			unionId = r.getUserDingtalkUnionIdWithUserName(ctx, accessToken, taskExt.UserName)
+		} else {
+			return errorcode.ParamErr("taskExt参数错误,重要参数缺失")
+		}
+
 		// 附件url
 		var attachmentUrl string
 		for _, file := range rec.UserContent.File {
 			attachmentUrl = file.FileUrl
 			break
 		}
-		recordId, err := r.dingtalkNotableClient.InsertRecord(accessToken, &dingtalk.InsertRecordReq{
+
+		req := &dingtalk.InsertRecordReq{
 			BaseId:        r.conf.Dingtalk.TableDemand.BaseId,
 			SheetIdOrName: r.conf.Dingtalk.TableDemand.SheetIdOrName,
 			// OperatorId:    tool_callback.BotBugOptimizationSubmitAdminUnionId,
@ -271,7 +284,9 @@ func (r *Handle) handleBot(ctx context.Context, rec *entitys.Recognize, task *mo
 			CreatorUnionId: unionId,
 			Content:        rec.UserContent.Text,
 			AttachmentUrl:  attachmentUrl,
-		})
+		}
+
+		recordId, err := r.dingtalkNotableClient.InsertRecord(accessToken, req)
 		if err != nil {
 			errCode := r.dingtalkNotableClient.GetHTTPStatus(err)
 			// 权限不足
@ -284,12 +299,16 @@ func (r *Handle) handleBot(ctx context.Context, rec *entitys.Recognize, task *mo
 		if recordId == "" {
 			return errors.NewBusinessErr(422, "创建记录失败，请联系管理员")
 		}
-
+		var detailPage string
 		entitys.ResLog(rec.Ch, task.Index, "需求记录完成")
-
-		// 构建跳转链接
-		detailPage := util.BuildJumpLink(r.conf.Dingtalk.TableDemand.Url, "去查看")
-
+		switch rec.OutPutScene {
+		case entitys.OutPutSceneDingTalk:
+			// 构建跳转链接
+			detailPage = "[去查看](" + r.conf.Dingtalk.TableDemand.Url + ")"
+		default:
+			// 构建跳转链接
+			detailPage = util.BuildJumpLink(r.conf.Dingtalk.TableDemand.Url, "去查看")
+		}
 		entitys.ResText(rec.Ch, task.Index, fmt.Sprintf("需求已记录，正在分配相关人员处理，请您耐心等待处理结果。点击查看工单进度：%s", detailPage))

 		return nil
@ -300,16 +319,21 @@ func (r *Handle) handleBot(ctx context.Context, rec *entitys.Recognize, task *mo

 // getUserDingtalkUnionId 获取用户的 dingtalk unionId
 func (r *Handle) getUserDingtalkUnionId(ctx context.Context, accessToken, sessionID string) (unionId string) {
-	// 查询用户名
+	if len(sessionID) == 0 {
+		// 查询用户名
+		return ""
+	}
 	session, has, err := r.sessionImpl.FindOne(r.sessionImpl.WithSessionId(sessionID))
 	if err != nil || !has {
 		log.Warnf("session not found: %s", sessionID)
 		return
 	}
-	creatorName := session.UserName
+	return r.getUserDingtalkUnionIdWithUserName(ctx, accessToken, session.UserName)
+}

+func (r *Handle) getUserDingtalkUnionIdWithUserName(ctx context.Context, accessToken, userName string) (unionId string) {
 	// 获取创建者uid 用户名 -> dingtalk uid
-	creatorId, err := r.dingtalkContactClient.SearchUserOne(accessToken, creatorName)
+	creatorId, err := r.dingtalkContactClient.SearchUserOne(accessToken, userName)
 	if err != nil {
 		log.Warnf("search dingtalk user one failed: %v", err)
 		return
--- a/internal/biz/do/prompt.go
+++ b/internal/biz/do/prompt.go
@ -166,6 +166,7 @@ func (f *WithDingTalkBot) getUserContent(ctx context.Context, rec *entitys.Recog
 	}

 	if len(rec.ChatHis.Messages) > 0 {
+		content.WriteString("\n")
 		content.WriteString("### 引用历史聊天记录:\n")
 		content.WriteString(pkg.JsonStringIgonErr(rec.ChatHis))
 	}
--- a/internal/biz/group_config.go
+++ b/internal/biz/group_config.go
@ -42,6 +42,7 @@ type GroupConfigBiz struct {
 	conf                 *config.Config
 	rdb                  *utils.Rdb
 	macro                *do.Macro
+	handle               *do.Handle
 }

 // NewDingTalkBotBiz
@ -54,6 +55,8 @@ func NewGroupConfigBiz(
 	reportDailyCacheImpl *impl.ReportDailyCacheImpl,
 	rdb *utils.Rdb,
 	macro *do.Macro,
+	toolManager *tools.Manager,
+	handle *do.Handle,
 ) *GroupConfigBiz {
 	return &GroupConfigBiz{
 		botTools:             tools.BootTools,
@ -64,6 +67,8 @@ func NewGroupConfigBiz(
 		reportDailyCacheImpl: reportDailyCacheImpl,
 		rdb:                  rdb,
 		macro:                macro,
+		toolManager:          toolManager,
+		handle:               handle,
 	}
 }

@ -248,12 +253,18 @@ func (g *GroupConfigBiz) handleMatch(ctx context.Context, rec *entitys.Recognize
 			break
 		}
 	}
+	rec.OutPutScene = entitys.OutPutSceneDingTalk
 	if pointTask == nil || pointTask.Index == "other" {
 		return g.otherTask(ctx, rec)
 	}
+
 	switch constants.TaskType(pointTask.Type) {
 	case constants.TaskTypeFunc:
 		return g.handleTask(ctx, rec, pointTask)
+	case constants.TaskTypeBot:
+		return g.handle.HandleBot(ctx, rec, &entitys.Task{
+			Index: pointTask.Index,
+		})
 	case constants.TaskTypeReport:
 		return g.handleReport(ctx, rec, pointTask, groupConfig)
 	case constants.TaskTypeCozeWorkflow:
@ -303,7 +314,6 @@ func (q *GroupConfigBiz) handleTask(ctx context.Context, rec *entitys.Recognize,
 	if err != nil {
 		return
 	}
-
 	err = q.toolManager.ExecuteTool(ctx, configData.Tool, rec)
 	if err != nil {
 		return
--- a/internal/entitys/bot.go
+++ b/internal/entitys/bot.go
@ -21,3 +21,7 @@ type DingTalkBot struct {
 	ClientId     string `json:"client_id"`
 	ClientSecret string `json:"client_secret"`
 }
+
+type Task struct {
+	Index string `json:"bot_index"`
+}
--- a/internal/entitys/recognize.go
+++ b/internal/entitys/recognize.go
@ -14,8 +14,14 @@ type Recognize struct {
 	Ch           chan Response
 	Match        *Match
 	Ext          []byte
+	OutPutScene  OutPutScene
 }

+type OutPutScene string
+
+const OutPutSceneDingTalk OutPutScene = "markdown"
+const OutPutFormatHtml OutPutScene = "html"
+
 type TaskExt struct {
 	Auth          string `json:"auth"`
 	Session       string `json:"session"`
@ -23,6 +29,7 @@ type TaskExt struct {
 	SessionInfo   model.AiSession
 	Sys           model.AiSy
 	KnowledgeConf KnowledgeBaseRequest
+	UserName      string
 }

 type RegistrationTask struct {
--- a/internal/entitys/types.go
+++ b/internal/entitys/types.go
@ -64,7 +64,9 @@ type FunctionCall struct {
 type ToolDefinition struct {
 	Type     string      `json:"type"`
 	Function FunctionDef `json:"function"`
+	AuthFunc AuthFunc    `json:"function"`
 }
+type AuthFunc func(rec *Recognize) (token []byte, err error)

 // FunctionDef 函数定义
 type FunctionDef struct {
@ -77,7 +79,7 @@ type FunctionDef struct {
 type Tool interface {
 	Name() string
 	Description() string
-	Definition() ToolDefinition
+	Definition(ctx context.Context) ToolDefinition
 	Execute(ctx context.Context, requireData *Recognize) error
 }

--- a/internal/tools/manager.go
+++ b/internal/tools/manager.go
@ -6,6 +6,7 @@ import (
 	"ai_scheduler/internal/pkg/utils_ollama"
 	"ai_scheduler/internal/tools/public"
 	zltxtool "ai_scheduler/internal/tools/zltx"
+	"ai_scheduler/utils"
 	"context"

 	"fmt"
@ -15,10 +16,11 @@ import (
 type Manager struct {
 	tools map[string]entitys.Tool
 	llm   *utils_ollama.Client
+	rdb   *utils.Rdb
 }

 // NewManager 创建工具管理器
-func NewManager(config *config.Config, llm *utils_ollama.Client) *Manager {
+func NewManager(config *config.Config, llm *utils_ollama.Client, rdb *utils.Rdb) *Manager {
 	m := &Manager{
 		tools: make(map[string]entitys.Tool),
 		llm:   llm,
@ -26,7 +28,7 @@ func NewManager(config *config.Config, llm *utils_ollama.Client) *Manager {

 	// 注册直连天下订单详情工具
 	if config.Tools.ZltxOrderDetail.Enabled {
-		zltxOrderDetailTool := zltxtool.NewZltxOrderDetailTool(config.Tools.ZltxOrderDetail, m.llm)
+		zltxOrderDetailTool := zltxtool.NewZltxOrderDetailTool(config, rdb, m.llm)
 		m.tools[zltxOrderDetailTool.Name()] = zltxOrderDetailTool
 	}

@ -43,7 +45,7 @@ func NewManager(config *config.Config, llm *utils_ollama.Client) *Manager {
 	}
 	//注册直连天下订单统计工具
 	if config.Tools.ZltxOrderStatistics.Enabled {
-		zltxOrderStatisticsTool := zltxtool.NewZltxOrderStatisticsTool(config.Tools.ZltxOrderStatistics)
+		zltxOrderStatisticsTool := zltxtool.NewZltxOrderStatisticsTool(config, rdb)
 		m.tools[zltxOrderStatisticsTool.Name()] = zltxOrderStatisticsTool
 	}

@ -104,5 +106,10 @@ func (m *Manager) ExecuteTool(ctx context.Context, name string, rec *entitys.Rec
 		return fmt.Errorf("tool not found: %s", name)
 	}

+	return m.ExecuteToolWithToolObj(ctx, tool, rec)
+}
+
+// ExecuteTool 执行工具
+func (m *Manager) ExecuteToolWithToolObj(ctx context.Context, tool entitys.Tool, rec *entitys.Recognize) error {
 	return tool.Execute(ctx, rec)
 }
--- a/internal/tools/public/coze_company.go
+++ b/internal/tools/public/coze_company.go
@ -50,7 +50,7 @@ func (c *CozeCompany) Description() string {
 }

 // Definition 返回工具定义
-func (c *CozeCompany) Definition() entitys.ToolDefinition {
+func (c *CozeCompany) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
--- a/internal/tools/public/coze_express.go
+++ b/internal/tools/public/coze_express.go
@ -47,7 +47,7 @@ func (c *CozeExpress) Description() string {
 }

 // Definition 返回工具定义
-func (c *CozeExpress) Definition() entitys.ToolDefinition {
+func (c *CozeExpress) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
--- a/internal/tools/public/konwledge_base.go
+++ b/internal/tools/public/konwledge_base.go
@ -38,7 +38,7 @@ func (k *KnowledgeBaseTool) Description() string {
 }

 // Definition 返回工具定义
-func (k *KnowledgeBaseTool) Definition() entitys.ToolDefinition {
+func (k *KnowledgeBaseTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
--- a/internal/tools/public/normal_chat.go
+++ b/internal/tools/public/normal_chat.go
@ -38,7 +38,7 @@ type NormalChat struct {
 }

 // Definition 返回工具定义
-func (w *NormalChatTool) Definition() entitys.ToolDefinition {
+func (w *NormalChatTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{}
 }

--- a/internal/tools/public/weather.go
+++ b/internal/tools/public/weather.go
@ -35,7 +35,7 @@ func (w *WeatherTool) Description() string {
 }

 // Definition 返回工具定义
-func (w *WeatherTool) Definition() entitys.ToolDefinition {
+func (w *WeatherTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
--- a/internal/tools/zltx/order_after_reseller.go
+++ b/internal/tools/zltx/order_after_reseller.go
@ -33,7 +33,7 @@ func (t *OrderAfterSaleResellerTool) Description() string {
 }

 // 未使用-仅实现接口
-func (t *OrderAfterSaleResellerTool) Definition() entitys.ToolDefinition {
+func (t *OrderAfterSaleResellerTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{}
 }

--- a/internal/tools/zltx/order_after_reseller_batch.go
+++ b/internal/tools/zltx/order_after_reseller_batch.go
@ -31,7 +31,7 @@ func (t *OrderAfterSaleResellerBatchTool) Description() string {
 }

 // 未使用-仅实现接口
-func (t *OrderAfterSaleResellerBatchTool) Definition() entitys.ToolDefinition {
+func (t *OrderAfterSaleResellerBatchTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{}
 }

--- a/internal/tools/zltx/order_after_supplier.go
+++ b/internal/tools/zltx/order_after_supplier.go
@ -33,7 +33,7 @@ func (t *OrderAfterSaleSupplierTool) Description() string {
 }

 // 未使用-仅实现接口
-func (t *OrderAfterSaleSupplierTool) Definition() entitys.ToolDefinition {
+func (t *OrderAfterSaleSupplierTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{}
 }

--- a/internal/tools/zltx/zltx_order_detail.go
+++ b/internal/tools/zltx/zltx_order_detail.go
@ -4,26 +4,30 @@ import (
 	"ai_scheduler/internal/config"
 	"ai_scheduler/internal/entitys"
 	"ai_scheduler/internal/pkg"
+	"ai_scheduler/internal/pkg/lsxd"
 	"ai_scheduler/internal/pkg/rec_extra"
 	"ai_scheduler/internal/pkg/utils_ollama"
+	"ai_scheduler/utils"
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
+	"time"

 	"gitea.cdlsxd.cn/self-tools/l_request"
-	"github.com/gofiber/fiber/v2/log"
 	"github.com/ollama/ollama/api"
 )

 // ZltxOrderDetailTool 直连天下订单详情工具
 type ZltxOrderDetailTool struct {
-	config config.ToolConfig
+	config *config.Config
 	llm    *utils_ollama.Client
+	rdb    *utils.Rdb
 }

 // NewZltxOrderDetailTool 创建直连天下订单详情工具
-func NewZltxOrderDetailTool(config config.ToolConfig, llm *utils_ollama.Client) *ZltxOrderDetailTool {
-	return &ZltxOrderDetailTool{config: config, llm: llm}
+func NewZltxOrderDetailTool(config *config.Config, rdb *utils.Rdb, llm *utils_ollama.Client) *ZltxOrderDetailTool {
+	return &ZltxOrderDetailTool{config: config, rdb: rdb, llm: llm}
 }

 // Name 返回工具名称
@ -37,7 +41,7 @@ func (w *ZltxOrderDetailTool) Description() string {
 }

 // Definition 返回工具定义
-func (w *ZltxOrderDetailTool) Definition() entitys.ToolDefinition {
+func (w *ZltxOrderDetailTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
@ -54,6 +58,19 @@ func (w *ZltxOrderDetailTool) Definition() entitys.ToolDefinition {
 				"required": []string{"number"},
 			},
 		},
+		AuthFunc: func(rec *entitys.Recognize) ([]byte, error) {
+			ext, err := rec_extra.GetTaskRecExt(rec)
+			if err != nil {
+				return nil, err
+			}
+			if len(ext.Auth) > 0 {
+				return []byte(ext.Auth), nil
+			} else {
+				login := lsxd.NewLogin(w.config, w.rdb)
+				token := login.GetToken(ctx)
+				return []byte(token), nil
+			}
+		},
 	}
 }

@ -62,14 +79,74 @@ type ZltxOrderDetailRequest struct {
 	OrderNumber interface{} `json:"order_number"`
 }

+//type ZltxOrderDetailResponse struct {
+//	Code  int                 `json:"code"`
+//	Error string              `json:"error"`
+//	Data  ZltxOrderDetailData `json:"data"`
+//	Mes   string              `json:"mes"`
+//}
+
 // ZltxOrderDetailResponse 直连天下订单详情响应
 type ZltxOrderDetailResponse struct {
-	Code  int                 `json:"code"`
-	Error string              `json:"error"`
-	Data  ZltxOrderDetailData `json:"data"`
-	Mes   string              `json:"mes"`
+	Code  int    `json:"code"`
+	Data  Data   `json:"data"`
+	Error string `json:"error"`
 }

+type Data struct {
+	Direct *Direct `json:"direct"`
+	Order  *Order  `json:"order"`
+}
+
+type Direct struct {
+	SerialNumber        string  `json:"serialNumber"`
+	OrderOrderNumber    string  `json:"orderOrderNumber"`
+	TerminalAccount     string  `json:"terminalAccount"`
+	OursProductId       int     `json:"oursProductId"`
+	OursProductName     string  `json:"oursProductName"`
+	Status              int     `json:"status"`
+	TradePrice          float64 `json:"tradePrice"`
+	PlatformProductId   int     `json:"platformProductId"`
+	PlatformProductName string  `json:"platformProductName"`
+	PlatformId          int     `json:"platformId"`
+	PlatformName        string  `json:"platformName"`
+	PlatformPrice       float64 `json:"platformPrice"`
+	CreateTime          int     `json:"createTime"`
+	ExecuteTime         int     `json:"executeTime"`
+	Type                int     `json:"type"`
+	Reason              string  `json:"reason"`
+	ResellerId          int     `json:"resellerId"`
+	ResellerName        string  `json:"resellerName"`
+	Aftermarket         int     `json:"aftermarket"`
+	PurchasePrice       float64 `json:"purchasePrice"`
+	NeedAi              bool    `json:"needAi"`
+	AiReason            string  `json:"aiReason"`
+}
+
+type Order struct {
+	Id                  string  `json:"id"`
+	ResellerId          int     `json:"resellerId"`
+	ResellerName        string  `json:"resellerName"`
+	Status              int     `json:"status"`
+	PayStatus           int     `json:"payStatus"`
+	CreateTime          int     `json:"createTime"`
+	PayTime             int     `json:"payTime"`
+	Type                int     `json:"type"`
+	Account             string  `json:"account"`
+	Quantity            int     `json:"quantity"`
+	Amount              float64 `json:"amount"`
+	PayAmount           float64 `json:"payAmount"`
+	ResellerOrderNumber string  `json:"resellerOrderNumber"`
+	Price               int     `json:"price"`
+	NotifyTime          int     `json:"notifyTime"`
+	FinishTime          int     `json:"finishTime"`
+	Aftermarket         int     `json:"aftermarket"`
+	Remark              string  `json:"remark"`
+	OursProductId       int     `json:"oursProductId"`
+	OursProductName     string  `json:"oursProductName"`
+	OursProductPrice    int     `json:"oursProductPrice"`
+	TradePrice          float64 `json:"tradePrice"`
+}
 type ZltxOrderLogResponse struct {
 	Code  int    `json:"code"`
 	Error string `json:"error"`
@ -93,7 +170,7 @@ func (w *ZltxOrderDetailTool) Execute(ctx context.Context, rec *entitys.Recogniz
 	}

 	// 这里可以集成真实的直连天下订单详情API
-	return w.getZltxOrderDetail(rec, req.OrderNumber)
+	return w.getZltxOrderDetail(ctx, rec, req.OrderNumber)
 }

 func (r *ZltxOrderDetailRequest) UnmarshalJSON(data []byte) error {
@ -113,8 +190,8 @@ func (r *ZltxOrderDetailRequest) UnmarshalJSON(data []byte) error {
 }

 // getMockZltxOrderDetail 获取模拟直连天下订单详情数据
-func (w *ZltxOrderDetailTool) getZltxOrderDetail(rec *entitys.Recognize, number interface{}) (err error) {
-	log.Infof("订单编号：%v,类型：%v")
+func (w *ZltxOrderDetailTool) getZltxOrderDetail(ctx context.Context, rec *entitys.Recognize, number interface{}) (err error) {
+
 	var orderNum string
 	switch number.(type) {
 	case int, int32, int64:
@ -127,15 +204,15 @@ func (w *ZltxOrderDetailTool) getZltxOrderDetail(rec *entitys.Recognize, number
 		orderNum = fmt.Sprintf("%v", number)
 	}

-	ext, err := rec_extra.GetTaskRecExt(rec)
+	token, err := w.Definition(ctx).AuthFunc(rec)
 	if err != nil {
-		return
+		return err
 	}
 	//查询订单详情
 	req := l_request.Request{
-		Url: fmt.Sprintf(w.config.BaseURL, orderNum),
+		Url: fmt.Sprintf(w.config.Tools.ZltxOrderDetail.BaseURL, orderNum),
 		Headers: map[string]string{
-			"Authorization": fmt.Sprintf("Bearer %s", ext.Auth),
+			"Authorization": fmt.Sprintf("Bearer %s", token),
 		},
 		Method: "GET",
 	}
@ -156,15 +233,17 @@ func (w *ZltxOrderDetailTool) getZltxOrderDetail(rec *entitys.Recognize, number
 	if err = json.Unmarshal(res.Content, &resData); err != nil {
 		return
 	}
-	entitys.ResJson(rec.Ch, w.Name(), res.Text)
-
-	if resData.Data.Direct != nil {
+	if rec.OutPutScene == entitys.OutPutSceneDingTalk {
+		entitys.ResJson(rec.Ch, w.Name(), resData.ToForm())
+	} else {
+		entitys.ResJson(rec.Ch, w.Name(), res.Text)
 		entitys.ResLoading(rec.Ch, w.Name(), "正在分析订单日志")
-
+	}
+	if resData.Data.Direct != nil {
 		req = l_request.Request{
-			Url: fmt.Sprintf(w.config.AddURL, resData.Data.Direct["orderOrderNumber"].(string), resData.Data.Direct["serialNumber"].(string)),
+			Url: fmt.Sprintf(w.config.Tools.ZltxOrderDetail.AddURL, resData.Data.Direct.OrderOrderNumber, resData.Data.Direct.SerialNumber),
 			Headers: map[string]string{
-				"Authorization": fmt.Sprintf("Bearer %s", ext.Auth),
+				"Authorization": fmt.Sprintf("Bearer %s", token),
 			},
 			Method: "GET",
 		}
@ -184,7 +263,7 @@ func (w *ZltxOrderDetailTool) getZltxOrderDetail(rec *entitys.Recognize, number
 			return fmt.Errorf("订单日志解析失败：%s", err)
 		}

-		err = w.llm.ChatStream(context.TODO(), rec.Ch, []api.Message{
+		err = w.llm.ChatStream(ctx, rec.Ch, []api.Message{
 			{
 				Role: "system",
 				Content: "你是一个订单日志助手。用户可能会提供订单日志，你需要按以下规则处理：\n" +
@ -216,3 +295,95 @@ func (w *ZltxOrderDetailTool) getZltxOrderDetail(rec *entitys.Recognize, number
 	}
 	return
 }
+
+func (z *ZltxOrderDetailResponse) ToForm() string {
+	var res strings.Builder
+	res.WriteString("**普通订单** \n")
+	res.WriteString("\n## 订单号：" + z.Data.Order.Id)
+	res.WriteString("\n## 分销商订单号：" + z.Data.Order.ResellerOrderNumber)
+	res.WriteString("\n## 分销商：" + z.Data.Order.ResellerName)
+	res.WriteString("\n## 订单商品：" + z.Data.Order.OursProductName)
+	res.WriteString("\n## 充值账号：" + z.Data.Order.Account)
+	res.WriteString("\n## 折扣价/原价：" + fmt.Sprintf("%.2f", z.Data.Order.TradePrice))
+	res.WriteString("\n## 数量：" + fmt.Sprintf("%d", z.Data.Order.Quantity))
+	res.WriteString("\n## 订单总额：" + fmt.Sprintf("%.2f", z.Data.Order.Amount))
+	res.WriteString("\n## 订单状态：" + orderStatusMap(z.Data.Order.Status))
+	res.WriteString("\n## 支付状态：" + orderPayStatusMap(z.Data.Order.Status))
+	res.WriteString("\n## 创建时间：" + unixToDateFormat(z.Data.Order.CreateTime))
+	res.WriteString("\n## 完成时间：" + unixToDateFormat(z.Data.Order.FinishTime))
+	res.WriteString("\n---\n")
+
+	res.WriteString("\n**充值流水** \n")
+	res.WriteString("\n## 订单号：" + z.Data.Direct.OrderOrderNumber)
+	res.WriteString("\n## 流水号：" + z.Data.Direct.SerialNumber)
+	res.WriteString("\n## 商品：" + z.Data.Direct.OursProductName)
+	res.WriteString("\n## 使用接口：" + z.Data.Direct.PlatformName)
+	res.WriteString("\n## 接口商品名称：" + z.Data.Direct.PlatformProductName)
+	res.WriteString("\n## 上游价：" + fmt.Sprintf("%.2f", z.Data.Direct.PlatformPrice))
+	res.WriteString("\n## 下游价：" + fmt.Sprintf("%.2f", z.Data.Direct.TradePrice))
+	res.WriteString("\n## 上游采购价：" + fmt.Sprintf("%.2f", z.Data.Direct.PurchasePrice))
+	res.WriteString("\n## 充值账号：" + z.Data.Direct.TerminalAccount)
+	res.WriteString("\n## 创建时间：" + unixToDateFormat(z.Data.Direct.CreateTime))
+	res.WriteString("\n## 处理时间：" + unixToDateFormat(z.Data.Direct.ExecuteTime))
+	res.WriteString("\n## 状态：" + directStatusMap(z.Data.Direct.Status))
+	res.WriteString("\n")
+	res.WriteString("\n")
+	res.WriteString("\n")
+	return res.String()
+}
+
+func orderStatusMap(status int) string {
+	var OrderStatus = map[int]string{
+		0:  "下单中",
+		1:  "订单完成",
+		2:  "部分成功",
+		3:  "充值处理中",
+		4:  "已暂停",
+		-1: "关闭订单",
+		-2: "全部失败",
+	}
+	if _, ok := OrderStatus[status]; !ok {
+		return "未知"
+	}
+	return OrderStatus[status]
+}
+
+func unixToDateFormat(unix int) string {
+	return time.Unix(int64(unix), 0).Format("2006-01-02 15:04:05")
+}
+func orderPayStatusMap(status int) string {
+	var OrderPayStatus = map[int]string{
+		0:  "未支付",
+		1:  "支付中",
+		2:  "支付成功",
+		3:  "退款中",
+		4:  "全部退款",
+		5:  "部分退款",
+		-1: "支付失败",
+		-2: "退款失败",
+	}
+	if _, ok := OrderPayStatus[status]; !ok {
+		return "未知"
+	}
+	return OrderPayStatus[status]
+}
+
+func directStatusMap(status int) string {
+	var DirectStatus = map[int]string{
+		0:   "待充值",
+		1:   "充值成功",
+		2:   "充值中",
+		-1:  "充值失败",
+		-2:  "失败重试",
+		-98: "下单异常",
+		-99: "查询异常",
+		-6:  "手动失败",
+		-5:  "手动重试",
+		-4:  "叠加卡单",
+		-3:  "卡单",
+	}
+	if _, ok := DirectStatus[status]; !ok {
+		return "未知"
+	}
+	return DirectStatus[status]
+}
--- a/internal/tools/zltx/zltx_order_direct_log.go
+++ b/internal/tools/zltx/zltx_order_direct_log.go
@ -23,7 +23,7 @@ func (t *ZltxOrderLogTool) Description() string {
 	return "查询订单日志"
 }

-func (t *ZltxOrderLogTool) Definition() entitys.ToolDefinition {
+func (t *ZltxOrderLogTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
--- a/internal/tools/zltx/zltx_product.go
+++ b/internal/tools/zltx/zltx_product.go
@ -25,7 +25,7 @@ func (z ZltxProductTool) Description() string {
 	return "获取直连天下商品信息"
 }

-func (z ZltxProductTool) Definition() entitys.ToolDefinition {
+func (z ZltxProductTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
--- a/internal/tools/zltx/zltx_statistics.go
+++ b/internal/tools/zltx/zltx_statistics.go
@ -3,7 +3,9 @@ package zltx
 import (
 	"ai_scheduler/internal/config"
 	"ai_scheduler/internal/entitys"
+	"ai_scheduler/internal/pkg/lsxd"
 	"ai_scheduler/internal/pkg/rec_extra"
+	"ai_scheduler/utils"
 	"context"
 	"encoding/json"
 	"fmt"
@ -13,7 +15,8 @@ import (
 )

 type ZltxOrderStatisticsTool struct {
-	config config.ToolConfig
+	config *config.Config
+	rdb    *utils.Rdb
 }

 func (z ZltxOrderStatisticsTool) Name() string {
@ -24,7 +27,7 @@ func (z ZltxOrderStatisticsTool) Description() string {
 	return "通过账号获取订单统计信息"
 }

-func (z ZltxOrderStatisticsTool) Definition() entitys.ToolDefinition {
+func (z ZltxOrderStatisticsTool) Definition(ctx context.Context) entitys.ToolDefinition {
 	return entitys.ToolDefinition{
 		Type: "function",
 		Function: entitys.FunctionDef{
@ -41,6 +44,19 @@ func (z ZltxOrderStatisticsTool) Definition() entitys.ToolDefinition {
 				"required": []string{"number"},
 			},
 		},
+		AuthFunc: func(rec *entitys.Recognize) ([]byte, error) {
+			ext, err := rec_extra.GetTaskRecExt(rec)
+			if err != nil {
+				return nil, err
+			}
+			if len(ext.Auth) > 0 {
+				return []byte(ext.Auth), nil
+			} else {
+				login := lsxd.NewLogin(z.config, z.rdb)
+				token := login.GetToken(ctx)
+				return []byte(token), nil
+			}
+		},
 	}
 }

@ -56,7 +72,7 @@ func (z ZltxOrderStatisticsTool) Execute(ctx context.Context, rec *entitys.Recog
 	if req.Number == nil {
 		return fmt.Errorf("number is required")
 	}
-	return z.getZltxOrderStatistics(req.Number, rec)
+	return z.getZltxOrderStatistics(ctx, req.Number, rec)
 }

 type ZltxOrderStatisticsResponse struct {
@ -76,17 +92,17 @@ type ZltxOrderStatisticsData struct {
 	Total   int    `json:"total"`
 }

-func (z ZltxOrderStatisticsTool) getZltxOrderStatistics(number interface{}, rec *entitys.Recognize) error {
-	ext, err := rec_extra.GetTaskRecExt(rec)
+func (z ZltxOrderStatisticsTool) getZltxOrderStatistics(ctx context.Context, number interface{}, rec *entitys.Recognize) error {
+	token, err := z.Definition(ctx).AuthFunc(rec)
 	if err != nil {
 		return err
 	}
 	//查询订单详情
-	url := fmt.Sprintf("%s%s", z.config.BaseURL, fmt.Sprintf("%v", number))
+	url := fmt.Sprintf("%s%s", z.config.Tools.ZltxOrderStatistics.BaseURL, fmt.Sprintf("%v", number))
 	req := l_request.Request{
 		Url: url,
 		Headers: map[string]string{
-			"Authorization": fmt.Sprintf("Bearer %s", ext.Auth),
+			"Authorization": fmt.Sprintf("Bearer %s", string(token)),
 		},
 		Method: "GET",
 	}
@ -116,8 +132,9 @@ func (z ZltxOrderStatisticsTool) getZltxOrderStatistics(number interface{}, rec
 	return nil
 }

-func NewZltxOrderStatisticsTool(config config.ToolConfig) *ZltxOrderStatisticsTool {
+func NewZltxOrderStatisticsTool(config *config.Config, rdb *utils.Rdb) *ZltxOrderStatisticsTool {
 	return &ZltxOrderStatisticsTool{
 		config: config,
+		rdb:    rdb,
 	}
 }
Author	SHA1	Message	Date
renzhiyuan	787c17590e	Merge branch 'feature/rzy/bug_optimization_submit_and_order_search'	2026-01-19 16:45:42 +08:00
renzhiyuan	6a58919e8e	fix: 优化负利润分析和缓存处理逻辑	2026-01-19 16:45:21 +08:00
renzhiyuan	c4e2d30fc5	fix: 优化负利润分析和缓存处理逻辑	2026-01-19 15:32:45 +08:00