Updata:增加支持多月份导出

pkg/service/bundle/bundleBalance.go

@@ -344,6 +344,7 @@ func writeToExcel(filename string, items []*bundle.BundleBalanceExportItem) erro
 		"所属月份", "用户编号", "姓名", "手机号", "购买套餐时间",
 		"套餐金额", "增值服务金额", "支付金额", "币种", "手续费",
 		"套餐视频总数", "增值服务视频总数", "套餐视频单价", "增值视频单价",
+		"当月消耗套餐金额($)", "当月消耗增值金额($)",
 		"套餐账号总数", "增值账号总数", "套餐账号使用数", "增值账号使用数",
 		"当前可用套餐视频数", "当前可用增值视频数", "当前已用套餐视频数", "当前已用增值视频数", "当前作废套餐视频数", "当前作废增值视频数", "当月新增可用套餐视频数", "当月新增可用增值视频数", "当月使用套餐视频数", "当月使用增值视频数", "当月作废套餐视频数", "当月作废增值视频数",
 		"当前可用套餐图文数", "当前可用增值图文数", "当前已用套餐图文数", "当前已用增值图文数", "当前作废套餐图文数", "当前作废增值图文数", "当月新增可用套餐图文数", "当月新增可用增值图文数", "当月使用套餐图文数", "当月使用增值图文数", "当月作废套餐图文数", "当月作废增值图文数",
@@ -386,64 +387,76 @@ func writeToExcel(filename string, items []*bundle.BundleBalanceExportItem) erro
 		_ = write(13, fmt.Sprintf("%.2f", it.BundleVideoUnitPrice))
 		_ = write(14, fmt.Sprintf("%.2f", it.IncreaseVideoUnitPrice))
 
+		// 当月视频消耗金额($)
+		monthlyBundleVideoConsumptionPrice, err := strconv.ParseFloat(it.MonthlyBundleVideoConsumptionPrice, 64)
+		if err != nil {
+			return err
+		}
+		monthlyIncreaseVideoConsumptionPrice, err := strconv.ParseFloat(it.MonthlyIncreaseVideoConsumptionPrice, 64)
+		if err != nil {
+			return err
+		}
+		_ = write(15, fmt.Sprintf("%.2f", monthlyBundleVideoConsumptionPrice))
+		_ = write(16, fmt.Sprintf("%.2f", monthlyIncreaseVideoConsumptionPrice))
+
 		// 账号类
-		_ = write(15, int(it.BundleAccountNumber))
+		_ = write(17, int(it.BundleAccountNumber))
-		_ = write(16, int(it.IncreaseAccountNumber))
+		_ = write(18, int(it.IncreaseAccountNumber))
-		_ = write(17, int(it.BundleAccountConsumptionNumber))
+		_ = write(19, int(it.BundleAccountConsumptionNumber))
-		_ = write(18, int(it.IncreaseAccountConsumptionNumber))
+		_ = write(20, int(it.IncreaseAccountConsumptionNumber))
 
 		// 视频类
-		_ = write(19, int(it.MonthlyBundleVideoNumber))
+		_ = write(21, int(it.MonthlyBundleVideoNumber))
-		_ = write(20, int(it.MonthlyIncreaseVideoNumber))
+		_ = write(22, int(it.MonthlyIncreaseVideoNumber))
-		_ = write(21, int(it.BundleVideoConsumptionNumber))
+		_ = write(23, int(it.BundleVideoConsumptionNumber))
-		_ = write(22, int(it.IncreaseVideoConsumptionNumber))
+		_ = write(24, int(it.IncreaseVideoConsumptionNumber))
-		_ = write(23, int(it.InvalidBundleVideoNumber))
+		_ = write(25, int(it.InvalidBundleVideoNumber))
-		_ = write(24, int(it.InvalidIncreaseVideoNumber))
+		_ = write(26, int(it.InvalidIncreaseVideoNumber))
-		_ = write(25, int(it.MonthlyNewBundleVideoNumber))
+		_ = write(27, int(it.MonthlyNewBundleVideoNumber))
-		_ = write(26, int(it.MonthlyNewIncreaseVideoNumber))
+		_ = write(28, int(it.MonthlyNewIncreaseVideoNumber))
-		_ = write(27, int(it.MonthlyBundleVideoConsumptionNumber))
+		_ = write(29, int(it.MonthlyBundleVideoConsumptionNumber))
-		_ = write(28, int(it.MonthlyIncreaseVideoConsumptionNumber))
+		_ = write(30, int(it.MonthlyIncreaseVideoConsumptionNumber))
-		_ = write(29, int(it.MonthlyInvalidBundleVideoNumber))
+		_ = write(31, int(it.MonthlyInvalidBundleVideoNumber))
-		_ = write(30, int(it.MonthlyInvalidIncreaseVideoNumber))
+		_ = write(32, int(it.MonthlyInvalidIncreaseVideoNumber))
 
 		// 图文类
-		_ = write(31, int(it.MonthlyBundleImageNumber))
+		_ = write(33, int(it.MonthlyBundleImageNumber))
-		_ = write(32, int(it.MonthlyIncreaseImageNumber))
+		_ = write(34, int(it.MonthlyIncreaseImageNumber))
-		_ = write(33, int(it.BundleImageConsumptionNumber))
+		_ = write(35, int(it.BundleImageConsumptionNumber))
-		_ = write(34, int(it.IncreaseImageConsumptionNumber))
+		_ = write(36, int(it.IncreaseImageConsumptionNumber))
-		_ = write(35, int(it.InvalidBundleImageNumber))
+		_ = write(37, int(it.InvalidBundleImageNumber))
-		_ = write(36, int(it.InvalidIncreaseImageNumber))
+		_ = write(38, int(it.InvalidIncreaseImageNumber))
-		_ = write(37, int(it.MonthlyNewBundleImageNumber))
+		_ = write(39, int(it.MonthlyNewBundleImageNumber))
-		_ = write(38, int(it.MonthlyNewIncreaseImageNumber))
+		_ = write(40, int(it.MonthlyNewIncreaseImageNumber))
-		_ = write(39, int(it.MonthlyBundleImageConsumptionNumber))
+		_ = write(41, int(it.MonthlyBundleImageConsumptionNumber))
-		_ = write(40, int(it.MonthlyIncreaseImageConsumptionNumber))
+		_ = write(42, int(it.MonthlyIncreaseImageConsumptionNumber))
-		_ = write(41, int(it.MonthlyInvalidBundleImageNumber))
+		_ = write(43, int(it.MonthlyInvalidBundleImageNumber))
-		_ = write(42, int(it.MonthlyInvalidIncreaseImageNumber))
+		_ = write(44, int(it.MonthlyInvalidIncreaseImageNumber))
 
 		// 数据分析类
-		_ = write(43, int(it.MonthlyBundleDataAnalysisNumber))
+		_ = write(45, int(it.MonthlyBundleDataAnalysisNumber))
-		_ = write(44, int(it.MonthlyIncreaseDataAnalysisNumber))
+		_ = write(46, int(it.MonthlyIncreaseDataAnalysisNumber))
-		_ = write(45, int(it.BundleDataAnalysisConsumptionNumber))
+		_ = write(47, int(it.BundleDataAnalysisConsumptionNumber))
-		_ = write(46, int(it.IncreaseDataAnalysisConsumptionNumber))
+		_ = write(48, int(it.IncreaseDataAnalysisConsumptionNumber))
-		_ = write(47, int(it.InvalidBundleDataAnalysisNumber))
+		_ = write(49, int(it.InvalidBundleDataAnalysisNumber))
-		_ = write(48, int(it.InvalidIncreaseDataAnalysisNumber))
+		_ = write(50, int(it.InvalidIncreaseDataAnalysisNumber))
-		_ = write(49, int(it.MonthlyNewBundleDataAnalysisNumber))
+		_ = write(51, int(it.MonthlyNewBundleDataAnalysisNumber))
-		_ = write(50, int(it.MonthlyNewIncreaseDataAnalysisNumber))
+		_ = write(52, int(it.MonthlyNewIncreaseDataAnalysisNumber))
-		_ = write(51, int(it.MonthlyBundleDataAnalysisConsumptionNumber))
+		_ = write(53, int(it.MonthlyBundleDataAnalysisConsumptionNumber))
-		_ = write(52, int(it.MonthlyIncreaseDataAnalysisConsumptionNumber))
+		_ = write(54, int(it.MonthlyIncreaseDataAnalysisConsumptionNumber))
-		_ = write(53, int(it.MonthlyInvalidBundleDataAnalysisNumber))
+		_ = write(55, int(it.MonthlyInvalidBundleDataAnalysisNumber))
-		_ = write(54, int(it.MonthlyInvalidIncreaseDataAnalysisNumber))
+		_ = write(56, int(it.MonthlyInvalidIncreaseDataAnalysisNumber))
 
 		// 手动扩展类
-		_ = write(55, int(it.MonthlyNewManualAccountNumber))
+		_ = write(57, int(it.MonthlyNewManualAccountNumber))
-		_ = write(56, int(it.MonthlyNewManualVideoNumber))
+		_ = write(58, int(it.MonthlyNewManualVideoNumber))
-		_ = write(57, int(it.MonthlyNewManualImageNumber))
+		_ = write(59, int(it.MonthlyNewManualImageNumber))
-		_ = write(58, int(it.MonthlyNewManualDataAnalysisNumber))
+		_ = write(60, int(it.MonthlyNewManualDataAnalysisNumber))
-		_ = write(59, int(it.MonthlyNewDurationNumber))
+		_ = write(61, int(it.MonthlyNewDurationNumber))
-		_ = write(60, int(it.MonthlyManualAccountConsumptionNumber))
+		_ = write(62, int(it.MonthlyManualAccountConsumptionNumber))
-		_ = write(61, int(it.MonthlyManualVideoConsumptionNumber))
+		_ = write(63, int(it.MonthlyManualVideoConsumptionNumber))
-		_ = write(62, int(it.MonthlyManualImageConsumptionNumber))
+		_ = write(64, int(it.MonthlyManualImageConsumptionNumber))
-		_ = write(63, int(it.MonthlyManualDataAnalysisConsumptionNumber))
+		_ = write(65, int(it.MonthlyManualDataAnalysisConsumptionNumber))
 
 	}
 
@@ -463,7 +476,7 @@ func GetAccountBundleBalance(c *gin.Context) {
 		service.Error(c, err)
 		return
 	}
-	req.Month = time.Now().Format("2006-01")
+	req.Month = []string{time.Now().Format("2006-01")}
 	res, err := service.BundleProvider.GetBundleBalanceList(context.Background(), &req)
 	if err != nil {
 		service.Error(c, errors.New(common.GetBundleBalanceListFailed))

pkg/service/bundle/bundleMetrics.go

@@ -236,7 +236,7 @@ func MetricsVideoSubmitExport(ctx *gin.Context) {
 		return
 	}
 	newCtx := serviceCast.NewCtxWithUserInfo(ctx)
-	t, err := time.Parse("2006-01", req.Month)
+	t, err := time.Parse("2006-01", req.Month[0])
 	if err == nil {
 		resp, err = service.CastProvider.WorkList(newCtx, &cast.WorkListReq{
 			SubmitStartTime: datetime.BeginOfMonth(t).Format(time.DateTime),