Merge branch 'jng'

"x修改symbol"

.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/bundleOrder.go

@@ -607,7 +607,7 @@ func exportExcel(orderList []*bundle.OrderBundleRecordInfo) (*excelize.File, err
 
 	headers := []string{
 		"套餐订单号", "套餐类型", "套餐付款状态", "艺人手机号", "艺人", "套餐订单创建时间", "套餐支付时间", "套餐金额",
-		"增值服务订单号", "增值税服务金额", "结算金额", "币种", "手续费", "增值订单创建时间", "增值付款状态",
+		"增值服务订单号", "增值税服务金额", "支付金额", "币种", "手续费", "增值订单创建时间", "增值付款状态",
 	}
 	for i, h := range headers {
 		cell := fmt.Sprintf("%s%d", string(rune('A'+i)), 1)

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,
@@ -180,6 +181,8 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 		numMap["10500.00"] = 20
 		numMap["11500.00"] = 25
 		numMap["14100.00"] = 30
+		numMap["16200.00"] = 35
+		numMap["18300.00"] = 40
 		incrMap := make(map[string]float32)
 		incrMap["3150.00"] = 1650
 		incrMap["5600.00"] = 4100
@@ -188,6 +191,8 @@ func AutoCreateUserAndOrder(c *gin.Context) {
 		incrMap["10500.00"] = 9000
 		incrMap["11500.00"] = 10000
 		incrMap["14100.00"] = 12600
+		incrMap["16200.00"] = 14700
+		incrMap["18300.00"] = 16800
 		addTotalPrice = incrMap[unfinishInfo.OrderPayAmount]
 		fmt.Println("incrMap:", incrMap)
 		fmt.Println("unfinishInfo.OrderPayAmount:", unfinishInfo.OrderPayAmount)
@@ -330,6 +335,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)

pkg/service/secfilings/secfilings.go

@@ -147,7 +147,7 @@ func GetSecFilings(c *gin.Context) {
 		return
 	}
 	fmt.Println(req.FilingDate)
-	symbol := "MINM"
+	symbol := "FIEE"
 	beginDate := req.FilingDate
 	endDate := req.FilingDate
 	page := 0
@@ -191,7 +191,7 @@ func GetSecFilings(c *gin.Context) {
 		res, err := service.SecFilingProvider.IsSecFilingExist(c, &secFilings.IsSecFilingExistReq{
 			FilingDate: req.FilingDate,
 			Form:       v.FormType,
-			FinalLink:  v.FinalLink,
+			FinalLink:  v.Link,
 		})
 		if err != nil {
 			service.Error(c, err)
@@ -200,7 +200,7 @@ func GetSecFilings(c *gin.Context) {
 		data.Data = append(data.Data, &GetSecFilingsResult{
 			FilingDate: req.FilingDate,
 			Form:       v.FormType,
-			FileLink:   v.FinalLink,
+			FileLink:   v.Link,
 			IsSelect:   res.Exist,
 		})
 		data.Total++