Merge branch 'feature/v1.0.1' of https://jygit.jydev.jianyu360.cn/jianyu/jyOrderManager into feature/v1.0.1

config.yaml

@@ -182,3 +182,7 @@ qsqTopic: "jy_event"
 entAnalysisView: 1500
 entAnalysis500: 200
 automaticPaymentTime: 3
+depositPayUrl:   # 保证金支付页面地址
+  wx: "/weixin/pay/depositReturnMoney"
+  ali: "/depositReturnMoney/aliPage"
+

internal/controller/returnOnlineHandler.go

@@ -2,6 +2,8 @@ package controller
 
 import (
 	. "app.yhyue.com/moapp/jybase/api"
+	"app.yhyue.com/moapp/jybase/common"
+	"context"
 	"fmt"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -12,11 +14,20 @@ import (
 	"jyOrderManager/internal/consts"
 	"jyOrderManager/internal/logic/order"
 	"jyOrderManager/internal/model"
+	"log"
 	"regexp"
 	"strings"
 	"time"
 )
 
+var depositPayUrlMap map[string]interface{}
+
+func init() {
+	depositPayUrlMap = g.Cfg().MustGet(context.Background(), "depositPayUrl").Map()
+	if len(depositPayUrlMap) == 0 {
+		log.Fatal("配置项有误：depositPayUrl，请检查配置文件后再启动")
+	}
+}
 func GetReturnOnlineHandler(r *ghttp.Request) {
 	rData, err := func() (interface{}, error) {
 		var param model.OrderReturnOnlineParams
@@ -147,12 +158,12 @@ func depositHandler(r *ghttp.Request, param model.OrderReturnOnlineParams) (inte
 			token      = uuid2.New().String()
 			payPath    string
 		)
-		// TODO 替换调配置
+		//  配置
 		switch payWay {
 		case 1:
-			payPath = "/weixin/pay/returnMoney"
+			payPath = common.ObjToString(depositPayUrlMap["wx"])
 		case 2:
-			payPath = "/returnMoney/aliPage"
+			payPath = common.ObjToString(depositPayUrlMap["ali"])
 		default:
 			return nil, fmt.Errorf("方式异常")
 		}