From 6a3c0d44a62a25691ef39b607ce91dc2b648f700 Mon Sep 17 00:00:00 2001 From: ziming Date: Tue, 20 May 2025 14:37:43 +0800 Subject: [PATCH] kx --- internal/biz/cmb.go | 1 - internal/biz/kx/bb_to_wechat.go | 2 +- internal/biz/kx/cmb_to_bb.go | 2 +- internal/biz/kx/kx.go | 32 ++++++------ internal/biz/kx/kx_notice.go | 2 +- internal/biz/kx/wx_to_bb.go | 2 +- internal/biz/order.go | 67 +++++++++++++++++++++---- internal/biz/syn_notice/bb_to_wechat.go | 56 --------------------- internal/biz/syn_notice/cmb_to_bb.go | 41 --------------- internal/biz/syn_notice/syn_notice.go | 62 ----------------------- internal/biz/syn_notice/wx_to_bb.go | 43 ---------------- internal/data/mixrepoimpl/kx.go | 26 +++++----- 12 files changed, 90 insertions(+), 246 deletions(-) delete mode 100644 internal/biz/cmb.go delete mode 100644 internal/biz/syn_notice/bb_to_wechat.go delete mode 100644 internal/biz/syn_notice/cmb_to_bb.go delete mode 100644 internal/biz/syn_notice/syn_notice.go delete mode 100644 internal/biz/syn_notice/wx_to_bb.go diff --git a/internal/biz/cmb.go b/internal/biz/cmb.go deleted file mode 100644 index 26ded5e..0000000 --- a/internal/biz/cmb.go +++ /dev/null @@ -1 +0,0 @@ -package biz diff --git a/internal/biz/kx/bb_to_wechat.go b/internal/biz/kx/bb_to_wechat.go index 49fb478..382e700 100644 --- a/internal/biz/kx/bb_to_wechat.go +++ b/internal/biz/kx/bb_to_wechat.go @@ -27,7 +27,7 @@ type BBToWechatRequest struct { func (this *BBToWechatRequest) GetSynNotice() *SynNotice { return &SynNotice{ OutBizBo: this.TransactionId, - Type: SynNoticeTypeBBToWechat, + Type: NoticeTypeBBToWechat, BizContent: this, } } diff --git a/internal/biz/kx/cmb_to_bb.go b/internal/biz/kx/cmb_to_bb.go index 061db53..4ca5195 100644 --- a/internal/biz/kx/cmb_to_bb.go +++ b/internal/biz/kx/cmb_to_bb.go @@ -21,7 +21,7 @@ type CmbToBBRequest struct { func (this *CmbToBBRequest) GetSynNotice() *SynNotice { return &SynNotice{ OutBizBo: this.TransactionId, - Type: SynNoticeTypeCmbToBB, + Type: NoticeTypeCmbToBB, BizContent: this, } } diff --git a/internal/biz/kx/kx.go b/internal/biz/kx/kx.go index 6f73a5c..dd5145b 100644 --- a/internal/biz/kx/kx.go +++ b/internal/biz/kx/kx.go @@ -1,38 +1,38 @@ package kx -type SynNoticeType uint8 +type NoticeType uint8 const ( - SynNoticeTypeCmbToBB SynNoticeType = iota + 1 - SynNoticeTypeBBToWechat - SynNoticeTypeWechatToBB + NoticeTypeCmbToBB NoticeType = iota + 1 + NoticeTypeBBToWechat + NoticeTypeWechatToBB ) -var SynNoticeTypeMap = map[SynNoticeType]string{ - SynNoticeTypeCmbToBB: "招行请求蓝色兄弟", - SynNoticeTypeBBToWechat: "蓝色兄弟请求微信", - SynNoticeTypeWechatToBB: "微信请求蓝色兄弟", +var SynNoticeTypeMap = map[NoticeType]string{ + NoticeTypeCmbToBB: "招行请求蓝色兄弟", + NoticeTypeBBToWechat: "蓝色兄弟请求微信", + NoticeTypeWechatToBB: "微信请求蓝色兄弟", } -func (s SynNoticeType) GetText() string { +func (s NoticeType) GetText() string { if t, ok := SynNoticeTypeMap[s]; ok { return t } return "未知类型" } -func (s SynNoticeType) GetValue() uint8 { +func (s NoticeType) GetValue() uint8 { return uint8(s) } -func (s SynNoticeType) IsCmbToBB() bool { - return s == SynNoticeTypeCmbToBB +func (s NoticeType) IsCmbToBB() bool { + return s == NoticeTypeCmbToBB } -func (s SynNoticeType) IsBBToWechat() bool { - return s == SynNoticeTypeBBToWechat +func (s NoticeType) IsBBToWechat() bool { + return s == NoticeTypeBBToWechat } -func (s SynNoticeType) IsWechatToBB() bool { - return s == SynNoticeTypeWechatToBB +func (s NoticeType) IsWechatToBB() bool { + return s == NoticeTypeWechatToBB } diff --git a/internal/biz/kx/kx_notice.go b/internal/biz/kx/kx_notice.go index f64c644..154717e 100644 --- a/internal/biz/kx/kx_notice.go +++ b/internal/biz/kx/kx_notice.go @@ -14,7 +14,7 @@ type SynApiInterface interface { type SynNotice struct { OutBizBo string - Type SynNoticeType + Type NoticeType BizContent SynApiInterface } diff --git a/internal/biz/kx/wx_to_bb.go b/internal/biz/kx/wx_to_bb.go index 38473bd..0b810d8 100644 --- a/internal/biz/kx/wx_to_bb.go +++ b/internal/biz/kx/wx_to_bb.go @@ -33,7 +33,7 @@ type WechatToBBRequest struct { func (this *WechatToBBRequest) GetSynNotice() *SynNotice { return &SynNotice{ OutBizBo: this.OrderId, - Type: SynNoticeTypeBBToWechat, + Type: NoticeTypeBBToWechat, BizContent: this, } } diff --git a/internal/biz/order.go b/internal/biz/order.go index d3e3989..fa42312 100644 --- a/internal/biz/order.go +++ b/internal/biz/order.go @@ -9,18 +9,28 @@ import ( err2 "voucher/api/err" v1 "voucher/api/v1" "voucher/internal/biz/bo" + "voucher/internal/biz/kx" "voucher/internal/biz/vo" ) -func (c *VoucherBiz) CmbOrder(ctx context.Context, request *v1.CmbRequest) (*v1.CmbReply, error) { +func (v *VoucherBiz) CmbOrder(ctx context.Context, request *v1.CmbRequest) (*v1.CmbReply, error) { - order, err := c.cmbOrder(ctx, request) + order, err := v.cmbOrder(ctx, request) if err != nil { - return c.OrderFail(ctx, err) + return v.OrderFail(ctx, err) } - return c.OrderSuccess(ctx, order.OrderNo) + reply, err := v.OrderSuccess(ctx, order.OrderNo) + if err != nil { + return nil, err + } + + // 通知kx + b, _ := json.Marshal(reply) + _ = v.bbToWx(ctx, order, string(b)) + + return reply, nil } func (c *VoucherBiz) cmbOrder(ctx context.Context, request *v1.CmbRequest) (*bo.OrderBo, error) { @@ -53,6 +63,11 @@ func (c *VoucherBiz) cmbOrder(ctx context.Context, request *v1.CmbRequest) (*bo. func (v *VoucherBiz) Order(ctx context.Context, req *bo.OrderCreateReqBo, cmbReq *v1.CmbOrderRequest) (order *bo.OrderBo, err error) { + product, err3 := v.ProductRepo.GetByProductNo(ctx, req.ProductNo) + if err3 != nil { + return order, err3 + } + order, err = v.OrderRepo.GetByOutBizNo(ctx, vo.OrderTypeCmb, req.OutBizNo) if err != nil && !err2.IsDbNotFound(err) { @@ -71,11 +86,6 @@ func (v *VoucherBiz) Order(ctx context.Context, req *bo.OrderCreateReqBo, cmbReq return order, err } - product, err3 := v.ProductRepo.GetByProductNo(ctx, req.ProductNo) - if err3 != nil { - return order, err3 - } - order, err = v.order(ctx, req, product, cmbReq) if err != nil { return order, err @@ -92,6 +102,7 @@ func (v *VoucherBiz) order(ctx context.Context, req *bo.OrderCreateReqBo, produc } // 通知kx + _ = v.cmbToBB(ctx, cmbReq) // 注册通知标签 order.MerchantNo 批次创建商户, order.BatchNo 商品批次号 if err = v.registerNotifyTag(ctx, order.MerchantNo, order.BatchNo); err != nil { @@ -201,3 +212,41 @@ func (c *VoucherBiz) OrderFail(ctx context.Context, err error) (*v1.CmbReply, er return c.GetResponse(ctx, replyBizContent) } + +func (v *VoucherBiz) cmbToBB(ctx context.Context, cmbReq *v1.CmbOrderRequest) error { + + req := &kx.CmbToBBRequest{ + TransactionId: cmbReq.TransactionId, + ActivityId: cmbReq.ActivityId, + CmbUid: cmbReq.CmbUid, + CmbUidType: cmbReq.CmbUidType, + Timestamp: cmbReq.Timestamp, + AppId: cmbReq.AppId, + Attach: cmbReq.Attach, + } + + return v.KxMixRepo.Request(ctx, req.GetSynNotice()) +} + +func (v *VoucherBiz) bbToWx(ctx context.Context, order *bo.OrderBo, cmbRes string) error { + + wxRes, err := json.Marshal(map[string]string{"coupon_id": order.VoucherNo}) + if err != nil { + return err + } + + req := &kx.BBToWechatRequest{ + StockId: order.BatchNo, + OutRequestNo: order.OrderNo, + AppId: order.AppID, + StockCreatorMhId: order.MerchantNo, + CouponValue: 0, + CouponMinimum: 0, + CouponId: order.VoucherNo, + WxRes: string(wxRes), + CmbRes: cmbRes, + TransactionId: order.OutBizNo, + } + + return v.KxMixRepo.Request(ctx, req.GetSynNotice()) +} diff --git a/internal/biz/syn_notice/bb_to_wechat.go b/internal/biz/syn_notice/bb_to_wechat.go deleted file mode 100644 index 36ac1c8..0000000 --- a/internal/biz/syn_notice/bb_to_wechat.go +++ /dev/null @@ -1,56 +0,0 @@ -package syn_notice - -import ( - "encoding/json" - v1 "voucher/api/v1" - "voucher/internal/biz/bo" -) - -// BBToWechatRequest 蓝色兄弟请求微信发券接口数据同步Api -type BBToWechatRequest struct { - // 微信为每个批次分配的唯一id - StockId string `protobuf:"bytes,9,opt,name=stockId,proto3" json:"stockId,omitempty"` - // 商户此次发放凭据号（格式：商户id+日期+流水号） - OutRequestNo string `protobuf:"bytes,10,opt,name=outRequestNo,proto3" json:"outRequestNo,omitempty"` - // 微信为发券方商户分配的公众账号ID - AppId string `protobuf:"bytes,11,opt,name=appId,proto3" json:"appId,omitempty"` - // 批次创建方商户号 - StockCreatorMhId string `protobuf:"bytes,12,opt,name=stockCreatorMhId,json=stockCreatorMchid,proto3" json:"stockCreatorMhId,omitempty"` - // 券面额,单位：分 - CouponValue int32 `protobuf:"bytes,13,opt,name=couponValue,proto3" json:"couponValue,omitempty"` - // 面额发券批次门槛,单位：分 - CouponMinimum int32 `protobuf:"bytes,14,opt,name=couponMinimum,proto3" json:"couponMinimum,omitempty"` - // 微信为代金券唯一分配的id, 在微信请求失败时可能为空 - CouponId string `protobuf:"bytes,15,opt,name=couponId,proto3" json:"couponId,omitempty"` - // 微信返回结果 - WxRes string `protobuf:"bytes,16,opt,name=wxRes,proto3" json:"wxRes,omitempty"` - // 招行返回结果 - CmbRes string `protobuf:"bytes,17,opt,name=cmbRes,proto3" json:"cmbRes,omitempty"` - // 招行此次请求的数据的唯一流水号 - TransactionId string `protobuf:"bytes,18,opt,name=transactionId,proto3" json:"transactionId,omitempty"` -} - -func (this *BBToWechatRequest) SetByMinimum(miniMum int32) { - this.CouponMinimum = miniMum -} - -func (this *BBToWechatRequest) SetByOrder(order *bo.OrderBo) { - this.AppId = order.AppID - this.StockId = order.ProductNo - this.OutRequestNo = order.OrderNo - this.StockCreatorMhId = order.MerchantNo - this.CouponId = order.OrderNo -} - -func (this *BBToWechatRequest) SetByCmbReply(req *v1.CmbReply) { - b, _ := json.Marshal(req) - this.CmbRes = string(b) -} - -func (this *BBToWechatRequest) GetSynNotice() *SynNotice { - return &SynNotice{ - OutBizBo: this.TransactionId, - Type: SynNoticeTypeBBToWechat, - BizContent: this, - } -} diff --git a/internal/biz/syn_notice/cmb_to_bb.go b/internal/biz/syn_notice/cmb_to_bb.go deleted file mode 100644 index 8443aa0..0000000 --- a/internal/biz/syn_notice/cmb_to_bb.go +++ /dev/null @@ -1,41 +0,0 @@ -package syn_notice - -import ( - v1 "voucher/api/v1" -) - -// CmbToBBRequest 招行请求蓝色兄弟发券接口数据同步Api -type CmbToBBRequest struct { - // 唯一流水号 - TransactionId string `protobuf:"bytes,9,opt,name=transactionId,proto3" json:"transactionId,omitempty"` - // 外部合作方权益批次号 - ActivityId string `protobuf:"bytes,10,opt,name=activityId,proto3" json:"activityId,omitempty"` - // 招商银行用户号 用户标识，比如手机号、支付宝openId - CmbUid string `protobuf:"bytes,11,opt,name=cmbUid,proto3" json:"cmbUid,omitempty"` - // 用户标识类型，0-手机号，1-支付宝openId - CmbUidType string `protobuf:"bytes,12,opt,name=cmbUidType,proto3" json:"cmbUidType,omitempty"` - // 时间戳，长度为13位，精度为毫秒 - Timestamp string `protobuf:"bytes,13,opt,name=timestamp,proto3" json:"timestamp,omitempty"` - // appId - AppId string `protobuf:"bytes,14,opt,name=appId,proto3" json:"appId,omitempty"` - // 补丁 - Attach string `protobuf:"bytes,15,opt,name=attach,proto3" json:"attach,omitempty"` -} - -func (this *CmbToBBRequest) SetByBiz(bizContent *v1.CmbOrderRequest) { - this.TransactionId = bizContent.TransactionId - this.ActivityId = bizContent.ActivityId - this.CmbUid = bizContent.CmbUid - this.CmbUidType = bizContent.CmbUidType - this.Timestamp = bizContent.Timestamp - this.AppId = bizContent.AppId - this.Attach = bizContent.Attach -} - -func (this *CmbToBBRequest) GetSynNotice() *SynNotice { - return &SynNotice{ - OutBizBo: this.TransactionId, - Type: SynNoticeTypeCmbToBB, - BizContent: this, - } -} diff --git a/internal/biz/syn_notice/syn_notice.go b/internal/biz/syn_notice/syn_notice.go deleted file mode 100644 index 4e31886..0000000 --- a/internal/biz/syn_notice/syn_notice.go +++ /dev/null @@ -1,62 +0,0 @@ -package syn_notice - -import ( - "context" - "encoding/json" -) - -var _ SynApiInterface = (*CmbToBBRequest)(nil) -var _ SynApiInterface = (*BBToWechatRequest)(nil) -var _ SynApiInterface = (*WechatToBBRequest)(nil) - -type SynApiInterface interface { - GetSynNotice() *SynNotice -} - -type SynNotice struct { - OutBizBo string - Type SynNoticeType - BizContent SynApiInterface -} - -func (this *SynNotice) Marshal() ([]byte, error) { - return json.Marshal(this) -} - -// 上下文键类型，避免命名冲突 -type contextKey string - -const ( - contextCMBToBBKey contextKey = "cmb_to_bb" - contextBBToWXKey contextKey = "bb_to_wx" -) - -// SynApi 无状态服务 -type SynApi struct{} - -// NewSynApi 创建无状态的处理实例 -func NewSynApi() *SynApi { - return &SynApi{} -} - -// WithCmbTOBB 将 request 存入上下文 -func (w *SynApi) WithCmbTOBB(ctx context.Context) context.Context { - return context.WithValue(ctx, contextCMBToBBKey, &CmbToBBRequest{}) -} - -// GetCmbToBB 从上下文中获取 request -func (w *SynApi) GetCmbToBB(ctx context.Context) (*CmbToBBRequest, bool) { - req, ok := ctx.Value(contextCMBToBBKey).(*CmbToBBRequest) - return req, ok -} - -// WithBBToWX 将 request 存入上下文 -func (w *SynApi) WithBBToWX(ctx context.Context) context.Context { - return context.WithValue(ctx, contextBBToWXKey, &BBToWechatRequest{}) -} - -// GetBBToWX 从上下文中获取 request -func (w *SynApi) GetBBToWX(ctx context.Context) (*BBToWechatRequest, bool) { - req, ok := ctx.Value(contextBBToWXKey).(*BBToWechatRequest) - return req, ok -} diff --git a/internal/biz/syn_notice/wx_to_bb.go b/internal/biz/syn_notice/wx_to_bb.go deleted file mode 100644 index 06c4926..0000000 --- a/internal/biz/syn_notice/wx_to_bb.go +++ /dev/null @@ -1,43 +0,0 @@ -package syn_notice - -// WechatToBBRequest 微信回调蓝色兄弟接口数据同步Api -type WechatToBBRequest struct { - // 活动ID - ActivityId string `protobuf:"bytes,9,opt,name=activityId,proto3" json:"activityId,omitempty"` - // 活动名称 - ActivityName string `protobuf:"bytes,10,opt,name=activityName,proto3" json:"activityName,omitempty"` - // 优惠券ID - VoucherId string `protobuf:"bytes,11,opt,name=voucherId,proto3" json:"voucherId,omitempty"` - // 领取用户ID - UserId string `protobuf:"bytes,12,opt,name=userId,proto3" json:"userId,omitempty"` - // 核销时间（Unix时间戳，毫秒） - UseTime string `protobuf:"bytes,13,opt,name=useTime,proto3" json:"useTime,omitempty"` - // 核销金额（分） - UseAmount string `protobuf:"bytes,14,opt,name=useAmount,proto3" json:"useAmount,omitempty"` - // 券消息类型，例如券核销（V_USE,V_REFUND） - BizType string `protobuf:"bytes,15,opt,name=bizType,proto3" json:"bizType,omitempty"` - // 退款时间（Unix时间戳，毫秒） - RefundTime string `protobuf:"bytes,16,opt,name=refundTime,proto3" json:"refundTime,omitempty"` - // 退款金额（分） - RefundAmount string `protobuf:"bytes,17,opt,name=refundAmount,proto3" json:"refundAmount,omitempty"` - // 券状态，可用（ENABLED）/不可用（DISABLED） - VoucherStatus string `protobuf:"bytes,18,opt,name=voucherStatus,proto3" json:"voucherStatus,omitempty"` - // 幂等ID - OrderId string `protobuf:"bytes,19,opt,name=orderId,proto3" json:"orderId,omitempty"` - // 支付宝交易号 - TradeNo string `protobuf:"bytes,20,opt,name=tradeNo,proto3" json:"tradeNo,omitempty"` - // 券领取时间（Unix时间戳，毫秒） - GmtVoucherCreate string `protobuf:"bytes,21,opt,name=gmtVoucherCreate,proto3" json:"gmtVoucherCreate,omitempty"` -} - -func (this *WechatToBBRequest) SetByOrder() { - -} - -func (this *WechatToBBRequest) GetSynNotice() *SynNotice { - return &SynNotice{ - OutBizBo: this.OrderId, - Type: SynNoticeTypeBBToWechat, - BizContent: this, - } -} diff --git a/internal/data/mixrepoimpl/kx.go b/internal/data/mixrepoimpl/kx.go index 141e58d..1c7f2ce 100644 --- a/internal/data/mixrepoimpl/kx.go +++ b/internal/data/mixrepoimpl/kx.go @@ -2,15 +2,11 @@ package mixrepoimpl import ( "context" - "encoding/json" - "fmt" "github.com/go-kratos/kratos/v2/log" "net/http" "time" - v1 "voucher/api/v1" "voucher/internal/biz/kx" "voucher/internal/biz/mixrepos" - "voucher/internal/biz/vo" "voucher/internal/conf" "voucher/internal/pkg/request" ) @@ -39,20 +35,22 @@ func (s *KxMixRepoImpl) Request(ctx context.Context, req *kx.SynNotice) error { _, bodyBytes, err := request.Post(ctx, url, body, request.WithHeaders(h), request.WithTimeout(time.Second*20)) if err != nil { - log.Errorf("请求kx报错,url:%s,err:%v", url, err) + log.Errorf("请求kx报错,url:%s,body:%s,err:%v", url, string(body), err) return err } - var response *v1.CmbReply - if err = json.Unmarshal(bodyBytes, &response); err != nil { - log.Errorf("请求kx返回数据解析报错:%s,url:%s,bodyBytes:%s", err.Error(), url, string(bodyBytes)) - return err - } + log.Warnf("请求kx,url:%s,reqBody:%s,respBody:%s", url, string(body), string(bodyBytes)) - if response.RespCode != vo.CmbResponseStatusSuccess.GetValue() { - log.Errorf("请求kx返回报错:msg:%s,url:%s,bodyBytes:%s", response.RespMsg, url, string(bodyBytes)) - return fmt.Errorf(response.RespMsg) - } + //var response *v1.CmbReply + //if err = json.Unmarshal(bodyBytes, &response); err != nil { + // log.Errorf("请求kx返回数据解析报错:%s,url:%s,reqBody:%s,respBody:%s", err.Error(), url, string(bodyBytes)) + // return err + //} + // + //if response.RespCode != vo.CmbResponseStatusSuccess.GetValue() { + // log.Errorf("请求kx返回报错:msg:%s,url:%s,respBody:%s", response.RespMsg, url, string(bodyBytes)) + // return fmt.Errorf(response.RespMsg) + //} return nil }