fiee/fonchain-fiee
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
桀尼龟 2025-06-26 17:39:51 +08:00
commit 7ea988ccc5
4 changed files with 542 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1040
api/bundle/bundle.pb.go
View File

File diff suppressed because it is too large Load Diff

2
api/bundle/bundle_triple.pb.go
View File

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

2
pkg/service/bundle/pay.go
View File

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

10
pkg/utils/untils.go
View File

@ -118,7 +118,13 @@ func ToExcelByType(titleList []string, dataList []interface{}, dataType string,
// ResponseXls content 为上面生成的io.ReadSeeker， fileTag 为返回前端的文件名 // ResponseXls content 为上面生成的io.ReadSeeker， fileTag 为返回前端的文件名
func ResponseXls(c *gin.Context, content io.ReadSeeker, fileTag string) { func ResponseXls(c *gin.Context, content io.ReadSeeker, fileTag string) {
fileName := fmt.Sprintf("%s.%s", fileTag, ExcelPrefix) 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) http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
} }