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-07-08 16:14:17 +08:00
commit b33a776f93
2 changed files with 1453 additions and 1442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

3
pkg/service/bundle/reconciliation.go
View File

@ -45,7 +45,7 @@ func GetReconciliationListDownload(c *gin.Context) {
return return
} }
titleList := []string{ titleList := []string{
"关联套餐订单号", "关联增值服务订单号", "对账单创建时间", "艺人", "艺人手机号", "套餐", "支付金额", "币种", "支付渠道", "支付时间", "支付状态", "流水号", "关联套餐订单号", "关联增值服务订单号", "对账单创建时间", "艺人", "艺人手机号", "套餐", "支付金额", "手续费", "币种", "支付渠道", "支付时间", "支付状态", "流水号",
} }
var dataList []interface{} var dataList []interface{}
@ -64,6 +64,7 @@ func GetReconciliationListDownload(c *gin.Context) {
i.UserTel, i.UserTel,
i.BundleName, i.BundleName,
i.PayAmount, i.PayAmount,
i.HandlingFee,
currencyType, currencyType,
payChannel, payChannel,
i.PayTime, i.PayTime,