Merge branch 'jng' into dev

.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>

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

@@ -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)