From dd40bc250f58e8466155c1a636f46e34c0d7a732 Mon Sep 17 00:00:00 2001
From: renzhiyuan <465386466@qq.com>
Date: Wed, 14 Jan 2026 10:31:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=B4=9F=E5=88=A9?=
 =?UTF-8?q?=E6=B6=A6=E5=88=86=E6=9E=90=E6=8A=A5=E8=A1=A8=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/tools/bbxt/bbxt.go | 80 ++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/internal/tools/bbxt/bbxt.go b/internal/tools/bbxt/bbxt.go
index 926f973..56b87d3 100644
--- a/internal/tools/bbxt/bbxt.go
+++ b/internal/tools/bbxt/bbxt.go
@@ -189,53 +189,53 @@ func (b *BbxtTools) StatisOursProductLossSum(ctx context.Context, now time.Time,
 	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(totalDetail) > 0 {
-		err = initFunc(ctx, now, totalDetail, b)
+	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
 		}
-		filePath := b.cacheDir + "/kshj_total_ana" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
-		title := "截至" + timeCh + "亏损100以上的分销商&产品负利润原因"
-		err = b.resellerDetailFillExcelAna(b.excelTempDir+"/"+"kshj_total_ana.xlsx", filePath, totalDetail, title)
-		if err != nil {
-			return
-		}
-		report[2] = &ReportRes{
-			ReportName: "负利润分析(亏损100以上)",
-			Title:      "截至" + timeCh + "亏损100以上利润原因",
+		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)
+	//	if err != nil {
+	//		return
+	//	}
+	//	filePath := b.cacheDir + "/kshj_total_ana" + fmt.Sprintf("%d%d", time.Now().Unix(), rand.Intn(1000)) + ".xlsx"
+	//	title := "截至" + timeCh + "亏损100以上的分销商&产品负利润原因"
+	//	err = b.resellerDetailFillExcelAna(b.excelTempDir+"/"+"kshj_total_ana.xlsx", filePath, totalDetail, title)
+	//	if err != nil {
+	//		return
+	//	}
+	//	report[2] = &ReportRes{
+	//		ReportName: "负利润分析(亏损100以上)",
+	//		Title:      "截至" + timeCh + "亏损100以上利润原因",
+	//		Path:       filePath,
+	//		Data:       total,
+	//	}
+	//}
 	return report, nil
 }