Merge branch 'alibaba'

upstream/alibaba/ali_order.go

@@ -5,6 +5,7 @@ import (
 	"github.com/gogf/gf/encoding/gjson"
 	"github.com/gogf/gf/frame/g"
 	"github.com/gogf/gf/util/gconv"
+	"gitlab.jxhh.com/stbz/library.git/upstream/ali"
 )
 
 type orderAli struct {
@@ -238,11 +239,9 @@ func (s *orderAli) Pay(ctx context.Context, orderSn string) (res *CommonRes, err
 
 	//更换接口临时过渡
 	if !res.Success{
-		result, err = server.Post(ctx, "com.alibaba.trade/alibaba.trade.pay.protocolPay", g.Map{
-			"access_token": server.AccessToken,
-			"orderId":      orderSn,
-		})
-		_ = gjson.New(result).Scan(&res)
+		var aliRes *ali.CommonRes
+		aliRes,err = ali.Order.Pay(ctx,orderSn)
+		_ = gconv.Struct(aliRes,&res)
 	}