diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/AugmentWebviewStateStore.xml b/.idea/AugmentWebviewStateStore.xml new file mode 100644 index 0000000..5b1d7f4 --- /dev/null +++ b/.idea/AugmentWebviewStateStore.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/fonchain-fiee.iml b/.idea/fonchain-fiee.iml new file mode 100644 index 0000000..5e764c4 --- /dev/null +++ b/.idea/fonchain-fiee.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml new file mode 100644 index 0000000..7dc1249 --- /dev/null +++ b/.idea/git_toolbox_blame.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..014788e --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/conf/conf.ini b/conf/conf.ini new file mode 100644 index 0000000..6992f1b --- /dev/null +++ b/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 \ No newline at end of file diff --git a/pkg/service/bundle/reconciliation.go b/pkg/service/bundle/reconciliation.go index 85323af..506add4 100644 --- a/pkg/service/bundle/reconciliation.go +++ b/pkg/service/bundle/reconciliation.go @@ -331,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)