From ecb9654743d93374f051e558da6e9c39e2f9fd9e Mon Sep 17 00:00:00 2001 From: ziming Date: Fri, 19 Dec 2025 15:23:54 +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/bo/multi_notify_data_bo.go | 6 +++++- internal/biz/multi.go | 1 + internal/data/model/multi_notify_data.gen.go | 1 + test/bank_multi_activity_test.go | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/internal/biz/bo/multi_notify_data_bo.go b/internal/biz/bo/multi_notify_data_bo.go index d558e4e..36c5f25 100644 --- a/internal/biz/bo/multi_notify_data_bo.go +++ b/internal/biz/bo/multi_notify_data_bo.go @@ -1,6 +1,9 @@ package bo -import "time" +import ( + "time" + "voucher/internal/biz/vo" +) // MultiNotifyDataBo 领域实体Bo结构，字段和模型字段保持一致 type MultiNotifyDataBo struct { @@ -16,6 +19,7 @@ type MultiNotifyDataBo struct { ConsumeTime *time.Time TransactionID string EventType string + Status vo.WechatVoucherStatus OriginalData string NoticeNum int32 CreateTime *time.Time diff --git a/internal/biz/multi.go b/internal/biz/multi.go index 3772de2..21d7611 100644 --- a/internal/biz/multi.go +++ b/internal/biz/multi.go @@ -234,6 +234,7 @@ func (biz *MultiBiz) mndCreate(ctx context.Context, ip, source string, req *bo.W ConsumeTime: &req.PlainText.ConsumeInformation.ConsumeTime, TransactionID: req.PlainText.ConsumeInformation.TransactionID, EventType: req.EventType, + Status: req.PlainText.Status, OriginalData: originalData, }) } diff --git a/internal/data/model/multi_notify_data.gen.go b/internal/data/model/multi_notify_data.gen.go index bffbf9b..85de5ea 100644 --- a/internal/data/model/multi_notify_data.gen.go +++ b/internal/data/model/multi_notify_data.gen.go @@ -24,6 +24,7 @@ type MultiNotifyDatum struct { ConsumeTime *time.Time `gorm:"column:consume_time;not null;comment:核销时间" json:"consume_time"` // 核销时间 TransactionID string `gorm:"column:transaction_id;not null;comment:微信支付系统生成的订单号" json:"transaction_id"` // 微信支付系统生成的订单号 EventType string `gorm:"column:event_type;not null;comment:通知的类型" json:"event_type"` // 通知的类型 + Status string `gorm:"column:status;not null;comment:券状态" json:"status"` // 券状态 OriginalData string `gorm:"column:original_data;not null;comment:微信回调通知原始数据" json:"original_data"` // 微信回调通知原始数据 NoticeNum int32 `gorm:"column:notice_num;not null;comment:通知下游次数" json:"notice_num"` // 通知下游次数 CreateTime *time.Time `gorm:"column:create_time;not null;comment:创建时间" json:"create_time"` // 创建时间 diff --git a/test/bank_multi_activity_test.go b/test/bank_multi_activity_test.go index dfe0bad..c6922cb 100644 --- a/test/bank_multi_activity_test.go +++ b/test/bank_multi_activity_test.go @@ -57,7 +57,8 @@ func Test_MarketingQuery(t *testing.T) { func Test_QixingNotifyData(t *testing.T) { - wxBody := `{"id":"4ab2699d-e91d-5460-9810-25fd6d4c69a5","create_time":"2025-12-08T17:54:24+08:00","resource_type":"encrypt-resource","event_type":"COUPON.USE","summary":"代金券核销通知","original_type":"coupon","associated_data":"coupon","plain_text":{"stock_creator_mchid":"1652465541","stock_id":"21386484","coupon_id":"142388354994","coupon_name":"银行卡多笔立减","description":"","status":"SENDED","create_time":"2025-12-08T17:50:48+08:00","coupon_type":"NORMAL","no_cash":false,"singleitem":false,"business_type":"","consume_information":{"consume_time":"2025-12-08T17:54:24+08:00","consume_mchid":"1274938601","transaction_id":"4200002996202512083063051834","consume_amount":16}}}` + //wxBody := `{"id":"4ab2699d-e91d-5460-9810-25fd6d4c69a5","create_time":"2025-12-08T17:54:24+08:00","resource_type":"encrypt-resource","event_type":"COUPON.USE","summary":"代金券核销通知","original_type":"coupon","associated_data":"coupon","plain_text":{"stock_creator_mchid":"1652465541","stock_id":"21386484","coupon_id":"142388354994","coupon_name":"银行卡多笔立减","description":"","status":"SENDED","create_time":"2025-12-08T17:50:48+08:00","coupon_type":"NORMAL","no_cash":false,"singleitem":false,"business_type":"","consume_information":{"consume_time":"2025-12-08T17:54:24+08:00","consume_mchid":"1274938601","transaction_id":"4200002996202512083063051834","consume_amount":16}}}` + wxBody := `{"id":"4ab2699d-e91d-5460-9810-25fd6d4c69a6","create_time":"2025-12-08T17:54:24+08:00","resource_type":"encrypt-resource","event_type":"COUPON.USE","summary":"代金券核销通知","original_type":"coupon","associated_data":"coupon","plain_text":{"stock_creator_mchid":"1652465541","stock_id":"21386484","coupon_id":"142388354994","coupon_name":"银行卡多笔立减","description":"","status":"USED","create_time":"2025-12-08T17:50:48+08:00","coupon_type":"NORMAL","no_cash":false,"singleitem":false,"business_type":"","consume_information":{"consume_time":"2025-12-08T17:54:24+08:00","consume_mchid":"1274938601","transaction_id":"4200002996202512083063051834","consume_amount":16}}}` t.Log(len(wxBody)) content := base64.StdEncoding.EncodeToString([]byte(wxBody))