From c8b79898389e22f507b117f0411eb29261c07dc5 Mon Sep 17 00:00:00 2001
From: wolter <wolter@yourdomain.com>
Date: Fri, 29 Nov 2024 10:25:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=92=8C=E9=80=9A=E7=9F=A5=EF=BC=8C=E5=A1=AB=E5=86=99=E5=8D=A1?=
 =?UTF-8?q?=E5=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/api/internal/logic/yl/getOrderLogic.go | 11 ++++++++++-
 cmd/api/internal/logic/yl/ylAsyncLogic.go  | 10 +++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/cmd/api/internal/logic/yl/getOrderLogic.go b/cmd/api/internal/logic/yl/getOrderLogic.go
index dc94b70..6d1b7e5 100644
--- a/cmd/api/internal/logic/yl/getOrderLogic.go
+++ b/cmd/api/internal/logic/yl/getOrderLogic.go
@@ -9,6 +9,7 @@ import (
 	"rs/cmd/api/internal/svc"
 	"rs/cmd/api/internal/types"
 	"rs/rpc/transfer"
+	"strings"
 	"time"
 )
 
@@ -76,7 +77,7 @@ func (l *GetOrderLogic) GetOrder(req *types.GetOrderReq) (resp *types.GetOrderRs
 		Msg:             "",
 		SupplierId:      asyncReq.SupplierId,
 		CardNo:          "",
-		CardKey:         "",
+		CardKey:         l.getCode(data.Data.VoucherCode),
 		CardExpireTime:  endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second).Format(time.DateTime),
 		CardExchangeUrl: data.Data.ShortUrl,
 	}
@@ -124,3 +125,11 @@ func (l *GetOrderLogic) GetOrder2(req *types.GetOrderReq) (resp *types.GetOrderR
 
 	return
 }
+
+func (l *GetOrderLogic) getCode(voucherCode string) string {
+	if strings.Contains(voucherCode, "http") {
+		temp := strings.Split(strings.TrimSpace(voucherCode), "/")
+		return temp[len(temp)-1]
+	}
+	return voucherCode
+}
diff --git a/cmd/api/internal/logic/yl/ylAsyncLogic.go b/cmd/api/internal/logic/yl/ylAsyncLogic.go
index 7bfc7a4..82fdf1c 100644
--- a/cmd/api/internal/logic/yl/ylAsyncLogic.go
+++ b/cmd/api/internal/logic/yl/ylAsyncLogic.go
@@ -146,7 +146,7 @@ func (l *YlAsyncLogic) asyncSendMarket(supplierOrderNo string, asyncReq *types.A
 			Price:           asyncReq.Price,
 			SupplierId:      asyncReq.SupplierId,
 			CardNo:          "",
-			CardKey:         "",
+			CardKey:         l.getCode(data.VoucherCode),
 			CardExpireTime:  endTime.Add(23*time.Hour + 59*time.Minute + 59*time.Second).Format(time.DateTime),
 			CardExchangeUrl: data.ShortUrl,
 			Sign:            "",
@@ -268,3 +268,11 @@ func (l *YlAsyncLogic) updateOrder(req *types.AsyncReq, rsp *transfer.MarketKeyS
 		l.Logger.Errorf("order = %s 插入订单失败:%v", order, err.Error())
 	}
 }
+
+func (l *YlAsyncLogic) getCode(voucherCode string) string {
+	if strings.Contains(voucherCode, "http") {
+		temp := strings.Split(strings.TrimSpace(voucherCode), "/")
+		return temp[len(temp)-1]
+	}
+	return voucherCode
+}