liucaijun
/
voucher
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmb

This commit is contained in:
李子铭 2025-03-06 16:15:55 +08:00
parent 84927b7d30
commit 5abc4151ea
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/biz/bo/product_bo.go
View File

@ -12,7 +12,7 @@ type ProductBo struct {
ProductNo string ProductNo string
BatchName string BatchName string
BatchNo string BatchNo string
MerchantNo string MchId string
Channel vo.Channel Channel vo.Channel
CreateTime *time.Time CreateTime *time.Time
UpdateTime *time.Time UpdateTime *time.Time

2
internal/biz/cmb.go
View File

@ -59,7 +59,7 @@ func (v *VoucherBiz) CmbProductQuery(ctx context.Context, productNo string) (rep
return fmt.Errorf("只支持微信") return fmt.Errorf("只支持微信")
} }
wechatResp, err := v.WechatCpnRepo.QueryProduct(ctx, product.BatchNo, product.MerchantNo) wechatResp, err := v.WechatCpnRepo.QueryProduct(ctx, product.BatchNo, product.MchId)
if err != nil { if err != nil {
return err return err
} }

2
internal/biz/cmb/voucher.go
View File

@ -20,7 +20,7 @@ func (v *Cmb) Order(ctx context.Context, req *bo.OrderCreateReqBo, product *bo.P
ProductNo: req.ProductNo, ProductNo: req.ProductNo,
Account: req.Account, Account: req.Account,
AppID: req.AppID, AppID: req.AppID,
MerchantNo: product.MerchantNo, MerchantNo: product.MchId,
Channel: product.Channel, Channel: product.Channel,
BatchNo: product.BatchNo, BatchNo: product.BatchNo,
NotifyUrl: v.bc.Cmb.NotifyUrl, NotifyUrl: v.bc.Cmb.NotifyUrl,

12
internal/data/model/product.gen.go
View File

@ -13,12 +13,12 @@ const TableNameProduct = "product"
// Product mapped from table <product> // Product mapped from table <product>
type Product struct { type Product struct {
ID int32 `gorm:"column:id;primaryKey;autoIncrement:true" json:"id"` ID int32 `gorm:"column:id;primaryKey;autoIncrement:true" json:"id"`
Name string `gorm:"column:name;not null;comment:商品名称" json:"name"` // 商品名称 Name string `gorm:"column:name;not null;comment:商品名称" json:"name"` // 商品名称
ProductNo string `gorm:"column:product_no;not null;comment:商品编号" json:"product_no"` // 商品编号 ProductNo string `gorm:"column:product_no;not null;comment:商品编号" json:"product_no"` // 商品编号
BatchName string `gorm:"column:batch_name;not null;comment:批次名称" json:"batch_name"` // 批次名称 BatchName string `gorm:"column:batch_name;not null;comment:批次名称" json:"batch_name"` // 批次名称
BatchNo string `gorm:"column:batch_no;not null;comment:立减金批次号" json:"batch_no"` // 立减金批次号 BatchNo string `gorm:"column:batch_no;not null;comment:立减金批次号" json:"batch_no"` // 立减金批次号
MerchantNo string `gorm:"column:merchant_no;not null;comment:商户号，创建批次的商户号" json:"merchant_no"` // 商户号，创建批次的商户号 MchId string `gorm:"column:mch_id;not null;comment:商户号，创建批次的商户号" json:"mch_id"` // 商户号，创建批次的商户号
Channel uint8 `gorm:"column:channel;not null;comment:1:微信 2:支付宝" json:"channel"` // 1:微信 2:支付宝 Channel uint8 `gorm:"column:channel;not null;comment:1:微信 2:支付宝" json:"channel"` // 1:微信 2:支付宝
CreateTime *time.Time `gorm:"column:create_time;not null" json:"create_time"` CreateTime *time.Time `gorm:"column:create_time;not null" json:"create_time"`
UpdateTime *time.Time `gorm:"column:update_time" json:"update_time"` UpdateTime *time.Time `gorm:"column:update_time" json:"update_time"`
} }