From d1fb805dfff24d2f11ff850928cc593931cfcf02 Mon Sep 17 00:00:00 2001 From: ziming Date: Wed, 17 Dec 2025 14:44:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E7=AC=94=E7=AB=8B=E5=87=8F=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/biz/multi.go | 12 ++++++++++++ internal/pkg/helper/utils_test.go | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/internal/biz/multi.go b/internal/biz/multi.go index 12b4e0b..eddf098 100644 --- a/internal/biz/multi.go +++ b/internal/biz/multi.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/go-kratos/kratos/v2/log" "gorm.io/gorm" + err2 "voucher/api/err" v1 "voucher/api/v1" "voucher/internal/biz/bo" "voucher/internal/biz/cmb" @@ -61,6 +62,17 @@ func (biz *MultiBiz) Notify(ctx context.Context, ip, source string, req *bo.Wech return lock.NewMutex(biz.rdb.Rdb, cl.TTL).Lock(ctx, cl.Key, func(ctx context.Context) error { + _, err := biz.ProductRepo.GetByBatchNo(ctx, req.PlainText.StockID) + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil + } + if err2.IsDbNotFound(err) { + return nil + } + return err + } + order, err := biz.order(ctx, req) if err != nil { return err diff --git a/internal/pkg/helper/utils_test.go b/internal/pkg/helper/utils_test.go index 9051c14..82d4a7d 100644 --- a/internal/pkg/helper/utils_test.go +++ b/internal/pkg/helper/utils_test.go @@ -1,6 +1,7 @@ package helper import ( + "encoding/base64" "fmt" "testing" "time" @@ -50,6 +51,11 @@ func TestMd5(t *testing.T) { t.Log(ciphertext) } +func Test_DecodeString(t *testing.T) { + wxNotifyData, _ := base64.StdEncoding.DecodeString("eyJzdW1tYXJ5Ijoi5Luj6YeR5Yi45qC46ZSA6YCa55+lIiwiYXNzb2NpYXRlZF9kYXRhIjoiY291cG9uIiwiZXZlbnRfdHlwZSI6IkNPVVBPTi5VU0UiLCJjcmVhdGVfdGltZSI6IjIwMjUtMTItMTdUMTQ6MjQ6MDQrMDg6MDAiLCJwbGFpbl90ZXh0Ijp7InN0b2NrX2NyZWF0b3JfbWNoaWQiOiIxNzE1MzQ5NTc4Iiwic3RvY2tfaWQiOiIyMTM1NTI5OSIsImNvdXBvbl9pZCI6IjE0MzIxODQzNzA3NSIsInNpbmdsZWl0ZW1fZGlzY291bnRfb2ZmIjpudWxsLCJkaXNjb3VudF90byI6bnVsbCwiY291cG9uX25hbWUiOiLpk7booYzljaHlpJrnrJTnq4vlh48iLCJzdGF0dXMiOiJTRU5ERUQiLCJkZXNjcmlwdGlvbiI6IiIsImNyZWF0ZV90aW1lIjoiMjAyNS0xMi0xMlQyMTo0OTozMiswODowMCIsImNvdXBvbl90eXBlIjoiTk9STUFMIiwibm9fY2FzaCI6ZmFsc2UsImF2YWlsYWJsZV9iZWdpbl90aW1lIjoiMjAyNS0xMi0xMlQwMDowMDowMCswODowMCIsImF2YWlsYWJsZV9lbmRfdGltZSI6IjIwMjUtMTItMThUMjM6NTk6NTkrMDg6MDAiLCJzaW5nbGVpdGVtIjpmYWxzZSwibm9ybWFsX2NvdXBvbl9pbmZvcm1hdGlvbiI6eyJjb3Vwb25fYW1vdW50Ijo4NCwidHJhbnNhY3Rpb25fbWluaW11bSI6MX0sImNvbnN1bWVfaW5mb3JtYXRpb24iOnsiY29uc3VtZV90aW1lIjoiMjAyNS0xMi0xN1QxNDoyNDowNCswODowMCIsImNvbnN1bWVfbWNoaWQiOiIxNDA1MzEyNzAyIiwidHJhbnNhY3Rpb25faWQiOiI0MjAwMDAyOTk4MjAyNTEyMTcxMDI0MDI4OTQzIiwiY29uc3VtZV9hbW91bnQiOjE4LCJnb29kc19kZXRhaWwiOm51bGx9fSwicmVzb3VyY2VfdHlwZSI6ImVuY3J5cHQtcmVzb3VyY2UiLCJvcmlnaW5hbF90eXBlIjoiY291cG9uIiwiaWQiOiIyNmZhMGQ2ZC02NjM0LTU5ZGYtOWU0Yi00M2JjYmFiY2I4OGIifQ==") + t.Log(string(wxNotifyData)) +} + func TestLength(t *testing.T) { jsonStr := `{