修改

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml

.idea/fonchain-fiee.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/git_toolbox_blame.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/fonchain-fiee.iml" filepath="$PROJECT_DIR$/.idea/fonchain-fiee.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

api/bundle/bundle.validator.pb.go

@@ -5,11 +5,11 @@ package bundle
 
 import (
 	fmt "fmt"
+	math "math"
 	proto "github.com/golang/protobuf/proto"
+	_ "google.golang.org/protobuf/types/descriptorpb"
 	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
-	_ "google.golang.org/protobuf/types/descriptorpb"
-	math "math"
 )
 
 // Reference imports to suppress errors if they are not otherwise used.

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             v5.26.1
+// - protoc             v4.24.0--rc1
 // source: pb/bundle.proto
 
 package bundle

conf/conf.ini

@@ -0,0 +1,36 @@
+[system]
+Domain = "fiee"
+AppMode = "debug"
+HttpPort = ":8085"
+Host = "http://127.0.0.1:8085"
+RedirectUri = "/api/redirect/url"
+
+[bos]
+Ak = "ALTAKxrqOQHnAN525Tb2GX4Bhe"
+Sk = "d2ecaa9d75114d3b9f42b99014198306"
+BucketName = "dci-file-new"
+BosUrl = ".bj.bcebos.com"
+BosBaseDir = "fonchain-main"
+BosHttp = "https://"
+BosDomain = "cdns.fontree.cn"
+[oss]
+AccessKeyId =  "LTAI5tLz1fSK53FQAEC9uNSb"
+AccessKeySecret = "oGB9chrQzQzITXR2IGv37Ji5WxZh4j"
+Endpoint =        "oss-cn-hangzhou.aliyuncs.com"
+BucketName =       "fontree-test"
+BaseDir =      "fonchain-main"
+CdnHost =      "https://cdn-test.szjixun.cn"
+[redis]
+RedisDB = "2"
+RedisAddr = "127.0.0.1:6379"
+RedisPW = ""
+RedisDBNAme = "2"
+
+
+[ai]
+Host = "https://erpapi.fontree.cn"
+TelNum = "18021272627"
+Password = "Gy.123456"
+
+[service]
+IsHTTPS = false

pkg/service/bundle/reconciliation.go

@@ -45,7 +45,7 @@ func GetReconciliationListDownload(c *gin.Context) {
 		return
 	}
 	titleList := []string{
-		"关联套餐订单号", "关联增值服务订单号", "对账单创建时间", "艺人", "艺人手机号", "套餐", "支付金额", "币种", "支付渠道", "支付时间", "支付状态", "流水号",
+		"关联套餐订单号", "关联增值服务订单号", "对账单创建时间", "艺人", "艺人手机号", "套餐", "支付金额", "手续费", "币种", "支付渠道", "支付时间", "支付状态", "流水号",
 	}
 	var dataList []interface{}
 
@@ -64,6 +64,7 @@ func GetReconciliationListDownload(c *gin.Context) {
 			i.UserTel,
 			i.BundleName,
 			i.PayAmount,
+			i.HandlingFee,
 			currencyType,
 			payChannel,
 			i.PayTime,
@@ -330,6 +331,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 			PayTime:          unfinishInfo.PayTime,
 			UserID:           uint64(userResp.UserId),
 			SerialNumber:     unfinishInfo.OrderNo,
+			HandlingFee:      unfinishInfo.OrderFeeAmount,
 		})
 		if err != nil {
 			fmt.Println("=============== antom创建支付，创建对账单报错：", err)