解决冲突

api/bundle/bundle_triple.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v3.20.3
+// - protoc             v4.24.0--rc1
 // source: pb/bundle.proto
 
 package bundle

pkg/service/bundle/pay.go

@@ -679,6 +679,8 @@ func AntomWebhook(c *gin.Context) {
 			TimeUnit:                    timeUnit,
 			AssociatedorderNumber:       resp.OutTradeNo, //增值服务订单号
 			Type:                        2,               //自行购买
+			OperatorName:                orderLimit.UserName,
+			OperatorId:                  orderLimit.UserId,
 		})
 		if err != nil {
 			service.Error(c, err)

pkg/utils/untils.go

@@ -118,7 +118,13 @@ func ToExcelByType(titleList []string, dataList []interface{}, dataType string,
 // ResponseXls  content 为上面生成的io.ReadSeeker， fileTag 为返回前端的文件名
 func ResponseXls(c *gin.Context, content io.ReadSeeker, fileTag string) {
 	fileName := fmt.Sprintf("%s.%s", fileTag, ExcelPrefix)
-	c.Writer.Header().Add("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
+	// 返回 Excel 文件流给前端
-	c.Writer.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Header("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	c.Header("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
+	c.Header("File-Name", fmt.Sprintf("%s", fileName))
+	c.Header("Access-Control-Expose-Headers", "File-Name")
+	//_ = c.Writer(c.Writer)
+	//c.Writer.Header().Add("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
+	//c.Writer.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
 	http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
 }