fix: 修复配置加载并优化错误处理

config/config.yaml

@@ -5,9 +5,9 @@ server:
 
 ollama:
   base_url: "http://172.17.0.1:11434"
-  # model: "qwen3:8b"
-  # generate_model: "qwen3:8b"
-  # mapping_model: "qwen3:8b"
+#  model: "qwen3:8b"
+#  generate_model: "qwen3:8b"
+#  mapping_model: "qwen3:8b"
   model: "qwen3-coder:480b-cloud"
   generate_model: "qwen3-coder:480b-cloud"
   mapping_model: "deepseek-v3.2:cloud"
@@ -149,7 +149,7 @@ eino_tools:
   # == 通用工具 == 
   # 表格转图片
   excel2pic:
-    base_url: "http://excel2pic:8000/api/v1/convert"
+    base_url: "http://192.168.6.115:8010/api/v1/convert"
 
 dingtalk:
   api_key: "dingsbbntrkeiyazcfdg"

config/config_test.yaml

@@ -26,12 +26,11 @@ coze:
 
 lsxd:
   # 统一登录
-  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"
-
+  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"
 
 sys:
   session_len: 6
@@ -142,7 +141,7 @@ eino_tools:
   # == 通用工具 == 
   # 表格转图片
   excel2pic:
-    base_url: "http://192.168.6.109:8010/api/v1/convert"
+    base_url: "http://192.168.6.115:8010/api/v1/convert"
 
 dingtalk:
   api_key: "dingsbbntrkeiyazcfdg"

internal/biz/do/handle.go

@@ -506,7 +506,7 @@ func handleCozeWorkflowEvents(ctx context.Context, resp coze.Stream[coze.Workflo
 		case coze.WorkflowEventTypeMessage:
 			entitys.ResStream(ch, index, event.Message.Content)
 		case coze.WorkflowEventTypeError:
-			entitys.ResError(ch, index, fmt.Sprintf("工作流执行错误: %s", event.Error))
+			entitys.ResError(ch, index, fmt.Sprintf("工作流执行错误: %v", event.Error))
 		case coze.WorkflowEventTypeDone:
 			entitys.ResEnd(ch, index, "工作流执行完成")
 		case coze.WorkflowEventTypeInterrupt:

internal/biz/do/macro.go

@@ -26,6 +26,7 @@ import (
 
 type Macro struct {
 	botGroupImpl         *impl.BotGroupImpl
+	botGroupConfigImpl   *impl.BotGroupConfigImpl
 	reportDailyCacheImpl *impl.ReportDailyCacheImpl
 	config               *config.Config
 	rdb                  *utils.Rdb
@@ -36,12 +37,14 @@ func NewMacro(
 	reportDailyCacheImpl *impl.ReportDailyCacheImpl,
 	config *config.Config,
 	rdb *utils.Rdb,
+	botGroupConfigImpl *impl.BotGroupConfigImpl,
 ) *Macro {
 	return &Macro{
 		botGroupImpl:         botGroupImpl,
 		reportDailyCacheImpl: reportDailyCacheImpl,
 		config:               config,
 		rdb:                  rdb,
+		botGroupConfigImpl:   botGroupConfigImpl,
 	}
 }
 
@@ -193,7 +196,7 @@ func (m *Macro) ProductModify(ctx context.Context, content string, groupConfig *
 		groupConfig.ProductName = itemInfo
 		cond := builder.NewCond()
 		cond = cond.And(builder.Eq{"config_id": groupConfig.ConfigID})
-		err = m.botGroupImpl.UpdateByCond(&cond, groupConfig)
+		err = m.botGroupConfigImpl.UpdateByCond(&cond, groupConfig)
 		if err != nil {
 			err = fmt.Errorf("修改失败:%v", err)
 			return

internal/biz/do/macro_test.go

@@ -0,0 +1,32 @@
+package do
+
+import (
+	"ai_scheduler/internal/config"
+	"ai_scheduler/internal/data/impl"
+	"ai_scheduler/internal/data/model"
+
+	"ai_scheduler/utils"
+	"context"
+	"testing"
+)
+
+func Test_report(t *testing.T) {
+	con := "[利润同比报表]商品修改：官方–优酷周卡,官方–优酷月卡,官方–优酷季卡,官方–优酷年卡,,官方–爱奇艺-月卡,官方–爱奇艺-季卡,官方–爱奇艺-年卡,官方–芒果-PC周卡,官方–芒果-PC月卡,官方–芒果-PC季卡,官方–QQ音乐-绿钻月卡,官方–饿了么超级会员月卡,官方–网易云黑胶vip月卡,官方–喜马拉雅巅峰会员月卡，剪映会员7天卡，剪映会员月卡，剪映会员年卡，剪映SVIP会员7天卡，剪映SVIP会员月卡，剪映SVIP会员年卡"
+	run()
+
+	chatId, err, i := ma.ProductModify(context.Background(), con, &model.AiBotGroupConfig{ConfigID: 1, ToolList: "8,9,10,11,12,13,16"})
+	t.Log(chatId, err, i)
+}
+
+var ma *Macro
+
+func run() {
+	configConfig, _ := config.LoadConfigWithTest()
+	db, _ := utils.NewGormDb(configConfig)
+
+	rdb := utils.NewRdb(configConfig)
+	reportDailyCacheImpl := impl.NewReportDailyCacheImpl(db)
+	botGroupImpl := impl.NewBotGroupImpl(db)
+	botGroupConfigImpl := impl.NewBotGroupConfigImpl(db)
+	ma = NewMacro(botGroupImpl, reportDailyCacheImpl, configConfig, rdb, botGroupConfigImpl)
+}

internal/biz/group_config.go

@@ -98,14 +98,12 @@ func (g *GroupConfigBiz) GetReportLists(ctx context.Context, groupConfig *model.
 	if err != nil {
 		return
 	}
-
 	//追加电商充值系统统计 - 返回统一使用[]*bbxt.ReportRes
 	rechargeReports, err := g.rechargeDailyReport(ctx, time.Now(), nil, g.ossClient)
 	if err != nil || len(rechargeReports) == 0 {
 		return
 	}
-
-	reports = append(reports, rechargeReports...)
+	reports = append(rechargeReports, reports...)
 
 	return
 }
@@ -175,7 +173,7 @@ func (g *GroupConfigBiz) handleReport(ctx context.Context, rec *entitys.Recogniz
 		if _err != nil {
 			return _err
 		}
-		reports = append(reports, repo...)
+		reports = append(reports, repo)
 	case "report_sales_analysis":
 		product := strings.Split(groupConfig.ProductName, ",")
 		repo, _err := rep.GetStatisOfficialProductSum(t, product)
@@ -200,8 +198,9 @@ func (g *GroupConfigBiz) handleReport(ctx context.Context, rec *entitys.Recogniz
 		if _err != nil {
 			return _err
 		}
-		reports = append(reports, repo...)
 		reports = append(reports, rechargeReport...)
+		reports = append(reports, repo...)
+
 	case "report_daily_recharge":
 		product := strings.Split(groupConfig.ProductName, ",")
 		repo, _err := g.rechargeDailyReport(ctx, t, product, nil)

internal/biz/handle/dingtalk/send_card.go

@@ -115,6 +115,7 @@ func (s *SendCardClient) NewCard(ctx context.Context, cardSend *CardSend) error
 			s.processContentChannel(ctx, cardSend, cardInstanceId.String(), client)
 		}()
 		wg.Wait()
+		log.Info("处理通道结束")
 	}
 
 	return nil
@@ -163,7 +164,7 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
 
 	var (
 		contentBuilder strings.Builder
-		lastUpdate     time.Time
+		lastUpdate     = time.Now()
 	)
 	for {
 
@@ -173,6 +174,7 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
 				// 通道关闭，发送最终内容
 				if contentBuilder.Len() > 0 {
 					if err := s.updateCardContent(ctx, cardSend, cardInstanceId, contentBuilder.String(), client); err != nil {
+						log.Info("contentBuilder.Len()修改失败1")
 						s.logger.Errorf("更新卡片失败1:%s", err.Error())
 					}
 				}
@@ -181,6 +183,7 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
 			contentBuilder.WriteString(content)
 			if contentBuilder.Len() > 0 {
 				if err := s.updateCardContent(ctx, cardSend, cardInstanceId, contentBuilder.String(), client); err != nil {
+					log.Info("contentBuilder.Len()修改失败2")
 					s.logger.Errorf("更新卡片失败2：%s", err.Error())
 				}
 			}
@@ -188,10 +191,12 @@ func (s *SendCardClient) processContentChannel(ctx context.Context, cardSend *Ca
 
 		case <-heartbeatTicker.C:
 			if time.Now().Unix()-lastUpdate.Unix() >= HeardBeatX {
+				log.Infof("心跳超时,当前时间：%d,最后时间：%d", time.Now().Unix(), lastUpdate.Unix())
 				return
 			}
 
 		case <-ctx.Done():
+			log.Info("send_card上下文失效")
 			s.logger.Info("context canceled, stop channel processing")
 			return
 		}

internal/config/config.go

@@ -309,7 +309,7 @@ func LoadConfigWithEnv() (*Config, error) {
 	if err != nil {
 		return nil, err
 	}
-	viper.SetConfigFile(modularDir + "/config/config_env.yaml")
+	viper.SetConfigFile(modularDir + "/config/config.yaml")
 	viper.SetConfigType("yaml")
 	// 读取配置文件
 	if err := viper.ReadInConfig(); err != nil {

internal/services/dtalk_bot.go

@@ -64,9 +64,15 @@ func (d *DingBotService) runBackgroundTasks(ctx context.Context, data *chatbot.B
 	g.Go(func() error {
 		defer func() {
 			// 确保通道最终关闭
+			log.Println("流式处理协程关闭")
+
 			close(resChan)
 		}()
-		return d.dingTalkBotBiz.HandleStreamRes(ctx, data, resChan)
+		err := d.dingTalkBotBiz.HandleStreamRes(ctx, data, resChan)
+		if err != nil {
+			log.Println("流式回复产生错误，错误：", err.Error())
+		}
+		return err
 	})
 
 	// 2. 业务处理协程（负责关闭requireData.Ch）

internal/tools/bbxt/bbxt.go

@@ -13,6 +13,8 @@ import (
 	"sort"
 
 	"time"
+
+	"github.com/shopspring/decimal"
 )
 
 const (
@@ -37,6 +39,8 @@ var ResellerBlackListProduct = []string{
 	"蓝星严选连续包月",
 	"通钱-2025年12月",
 	"彦浩同行",
+	"运营部测试专用",
+	"彦浩直客商户",
 }
 
 type BbxtTools struct {
@@ -91,9 +95,7 @@ func (b *BbxtTools) DailyReport(
 	if err != nil {
 		return
 	}
-	reports = append(reports, productLossReport...)
-	reports = append(reports, profitRankingSum, statisOfficialProductSum, statisOfficialProductSumDecline)
-
+	reports = append(reports, profitRankingSum, statisOfficialProductSum, statisOfficialProductSumDecline, productLossReport)
 	if ossClient != nil {
 		uploader := NewUploader(ossClient, b.config)
 		for _, report := range reports {
@@ -135,7 +137,9 @@ func (b *BbxtTools) ResellerLossSort(ctx context.Context, now time.Time) ([]*Res
 		reseller := resellerMap[info.ResellerId]
 
 		// 累加经销商总亏损
-		reseller.Total += info.Loss
+		num1 := decimal.NewFromFloat(reseller.Total)
+		num2 := decimal.NewFromFloat(info.Loss)
+		reseller.Total, _ = num1.Add(num2).Round(2).Float64()
 
 		// 检查产品是否已存在
 		if _, ok := reseller.ProductLoss[info.OursProductId]; !ok {
@@ -209,61 +213,66 @@ func (b *BbxtTools) ResellerLossToMapResellerLossSumProductRelation(totalDetail
 }
 
 // StatisOursProductLossSum 负利润分析
-func (b *BbxtTools) StatisOursProductLossSum(ctx context.Context, now time.Time, initFunc LossSumInitFunc) (report []*ReportRes, err error) {
+func (b *BbxtTools) StatisOursProductLossSum(ctx context.Context, now time.Time, initFunc LossSumInitFunc) (report *ReportRes, err error) {
 	resellers, err := b.ResellerLossSort(ctx, now)
 	var (
-		total       [][]string
-		gt          []*ResellerLoss
+		total [][]string
+		//gt          []*ResellerLoss
 		totalDetail []*ResellerLoss
-		totalSum    float64
-		totalSum500 float64
+		totalSum    = decimal.NewFromFloat(0)
+		//totalSum500 float64
 	)
 	// 构建分组
 	for _, v := range resellers {
-		if v.Total <= -100 && !slices.Contains(ResellerBlackListProduct, v.ResellerName) {
+		if slices.Contains(ResellerBlackListProduct, v.ResellerName) {
+			continue
+		}
+		if v.Total <= -100 {
 			total = append(total, []string{
 				fmt.Sprintf("%s", v.ResellerName),
 				fmt.Sprintf("%.2f", v.Total),
 			})
-			totalSum += v.Total
+
 			totalDetail = append(totalDetail, v)
 		}
-		if v.Total <= -500 && !slices.Contains(ResellerBlackListProduct, v.ResellerName) {
-			gt = append(gt, v)
-			totalSum500 += v.Total
-		}
+		num := decimal.NewFromFloat(v.Total)
+		totalSum = totalSum.Add(num).Round(2)
+		//if v.Total <= -500 && !slices.Contains(ResellerBlackListProduct, v.ResellerName) {
+		//	gt = append(gt, v)
+		//	totalSum500 += v.Total
+		//}
 	}
-	report = make([]*ReportRes, 3)
+	//report = make([]*ReportRes, 3)
 	timeCh := now.Format("1月2日15点")
 	//总量生成excel
-	if len(total) > 0 {
-		filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
-		err = b.SimpleFillExcelWithTitle(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total, "")
-		if err != nil {
-			return
-		}
-		report[0] = &ReportRes{
-			ReportName: "分销商负利润统计",
-			Title:      "截至" + timeCh + "利润累计亏损" + fmt.Sprintf("%.2f", totalSum),
-			Path:       filePath,
-			Data:       total,
-		}
-	}
-
-	if len(gt) > 0 {
-		filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
-		title := "截至" + timeCh + "亏损500以上的分销商和产品"
-		err = b.resellerDetailFillExcelV2(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt, title)
-		if err != nil {
-			return
-		}
-		report[1] = &ReportRes{
-			ReportName: "负利润分析(亏损500以上)",
-			Title:      "截至" + timeCh + "亏损500以上利润累计亏损" + fmt.Sprintf("%.2f", totalSum500),
-			Path:       filePath,
-			Data:       total,
-		}
-	}
+	//if len(total) > 0 {
+	//	filePath := b.cacheDir + "/kshj_total" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
+	//	err = b.SimpleFillExcelWithTitle(b.excelTempDir+"/"+"kshj_total.xlsx", filePath, total, "")
+	//	if err != nil {
+	//		return
+	//	}
+	//	report[0] = &ReportRes{
+	//		ReportName: "分销商负利润统计",
+	//		Title:      "截至" + timeCh + "利润累计亏损" + fmt.Sprintf("%.2f", totalSum),
+	//		Path:       filePath,
+	//		Data:       total,
+	//	}
+	//}
+	//
+	//if len(gt) > 0 {
+	//	filePath := b.cacheDir + "/kshj_gt" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
+	//	title := "截至" + timeCh + "亏损500以上的分销商和产品"
+	//	err = b.resellerDetailFillExcelV2(b.excelTempDir+"/"+"kshj_gt.xlsx", filePath, gt, title)
+	//	if err != nil {
+	//		return
+	//	}
+	//	report[1] = &ReportRes{
+	//		ReportName: "负利润分析(亏损500以上)",
+	//		Title:      "截至" + timeCh + "亏损500以上利润累计亏损" + fmt.Sprintf("%.2f", totalSum500),
+	//		Path:       filePath,
+	//		Data:       total,
+	//	}
+	//}
 
 	if len(totalDetail) > 0 {
 		err = initFunc(ctx, now, totalDetail, b)
@@ -271,14 +280,15 @@ func (b *BbxtTools) StatisOursProductLossSum(ctx context.Context, now time.Time,
 			return
 		}
 		filePath := b.cacheDir + "/kshj_total_ana" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
-		title := "截至" + timeCh + "亏损100以上的分销商&产品负利润原因"
+		totalSumFloat64, _ := totalSum.Float64()
+		title := "截至" + timeCh + "利润累计亏损" + fmt.Sprintf("%.2f", totalSumFloat64) + ",亏损100以上利润原因如下"
 		err = b.resellerDetailFillExcelAna(b.excelTempDir+"/"+"kshj_total_ana.xlsx", filePath, totalDetail, title)
 		if err != nil {
 			return
 		}
-		report[2] = &ReportRes{
+		report = &ReportRes{
 			ReportName: "负利润分析(亏损100以上)",
-			Title:      "截至" + timeCh + "亏损100以上利润原因",
+			Title:      title,
 			Path:       filePath,
 			Data:       total,
 		}

internal/tools/bbxt/bbxt_test.go

@@ -106,7 +106,7 @@ var (
 )
 
 func run() {
-	configConfig, _ = config.LoadConfigWithTest()
+	configConfig, _ = config.LoadConfigWithEnv()
 	// 初始化数据库连接
 	db, _ := utils.NewGormDb(configConfig)
 	reportDailyCacheImpl = impl.NewReportDailyCacheImpl(db)

internal/tools/bbxt/excel.go

@@ -343,14 +343,17 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
 
 	styleD3, err := f.GetCellStyle(sheet, fmt.Sprintf("D%d", tplRowData))
 	if err != nil {
-		styleC3 = 0
+		styleD3 = 0
 	}
 
 	styleE3, err := f.GetCellStyle(sheet, fmt.Sprintf("E%d", tplRowData))
 	if err != nil {
-		styleC3 = 0
+		styleE3 = 0
+	}
+	styleF3, err := f.GetCellStyle(sheet, fmt.Sprintf("F%d", tplRowData))
+	if err != nil {
+		styleF3 = 0
 	}
-
 	rowHeightData, err := f.GetRowHeight(sheet, tplRowData)
 	if err != nil {
 		rowHeightData = 20
@@ -372,11 +375,15 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
 	}
 	styleTotalD, err := f.GetCellStyle(sheet, fmt.Sprintf("D%d", tplRowTotal))
 	if err != nil {
-		styleTotalC = 0
+		styleTotalD = 0
 	}
 	styleTotalE, err := f.GetCellStyle(sheet, fmt.Sprintf("E%d", tplRowTotal))
 	if err != nil {
-		styleTotalC = 0
+		styleTotalE = 0
+	}
+	styleTotalF, err := f.GetCellStyle(sheet, fmt.Sprintf("F%d", tplRowTotal))
+	if err != nil {
+		styleTotalF = 0
 	}
 	rowHeightTotal, err := f.GetRowHeight(sheet, tplRowTotal)
 	if err != nil {
@@ -408,8 +415,9 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
 			f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), reseller.ResellerName)
 			f.SetCellValue(sheet, fmt.Sprintf("B%d", currentRow), p.ProductName)
 			f.SetCellValue(sheet, fmt.Sprintf("C%d", currentRow), p.Loss)
-			f.SetCellValue(sheet, fmt.Sprintf("D%d", currentRow), reseller.Manager)
-			f.SetCellValue(sheet, fmt.Sprintf("E%d", currentRow), p.LossReason)
+			f.SetCellValue(sheet, fmt.Sprintf("D%d", currentRow), reseller.Total)
+			f.SetCellValue(sheet, fmt.Sprintf("E%d", currentRow), reseller.Manager)
+			f.SetCellValue(sheet, fmt.Sprintf("F%d", currentRow), p.LossReason)
 			// 设置样式
 			if styleA3 != 0 {
 				f.SetCellStyle(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("A%d", currentRow), styleA3)
@@ -426,7 +434,9 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
 			if styleE3 != 0 {
 				f.SetCellStyle(sheet, fmt.Sprintf("E%d", currentRow), fmt.Sprintf("E%d", currentRow), styleE3)
 			}
-
+			if styleF3 != 0 {
+				f.SetCellStyle(sheet, fmt.Sprintf("F%d", currentRow), fmt.Sprintf("F%d", currentRow), styleF3)
+			}
 			totalLoss += p.Loss
 			currentRow++
 		}
@@ -436,6 +446,7 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
 		if endRow > startRow {
 			f.MergeCell(sheet, fmt.Sprintf("A%d", startRow), fmt.Sprintf("A%d", endRow))
 			f.MergeCell(sheet, fmt.Sprintf("D%d", startRow), fmt.Sprintf("D%d", endRow))
+			f.MergeCell(sheet, fmt.Sprintf("E%d", startRow), fmt.Sprintf("E%d", endRow))
 		}
 	}
 
@@ -447,7 +458,7 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
 
 	f.SetCellValue(sheet, fmt.Sprintf("A%d", currentRow), "合计")
 	// B列留空，C列填充总亏损
-	f.SetCellValue(sheet, fmt.Sprintf("C%d", currentRow), totalLoss)
+	f.SetCellValue(sheet, fmt.Sprintf("D%d", currentRow), totalLoss)
 
 	// 设置合计行样式
 	if styleTotalA != 0 {
@@ -465,7 +476,9 @@ func (b *BbxtTools) resellerDetailFillExcelAna(templatePath, outputPath string,
 	if styleTotalE != 0 {
 		f.SetCellStyle(sheet, fmt.Sprintf("E%d", currentRow), fmt.Sprintf("E%d", currentRow), styleTotalE)
 	}
-
+	if styleTotalF != 0 {
+		f.SetCellStyle(sheet, fmt.Sprintf("F%d", currentRow), fmt.Sprintf("F%d", currentRow), styleTotalF)
+	}
 	// 取消合并合计行的A、B列
 	// f.MergeCell(sheet, fmt.Sprintf("A%d", currentRow), fmt.Sprintf("B%d", currentRow))