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

cmb

This commit is contained in:
李子铭 2025-03-08 14:04:35 +08:00
parent d61cd68faa
commit d6a70119ce
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/biz/bo/order_bo.go
View File

@ -29,6 +29,7 @@ type OrderCreateReqBo struct {
ProductNo string ProductNo string
Account string Account string
AppID string AppID string
Type vo.OrderType
AccountType vo.OrderAccountType AccountType vo.OrderAccountType
} }

2
internal/biz/cmb.go
View File

@ -17,7 +17,7 @@ func (v *VoucherBiz) CmbOrder(ctx context.Context, req *bo.OrderCreateReqBo) (or
err = lock.NewMutex(v.rdb.Rdb, c.TTL).Lock(ctx, c.Key, func(ctx context.Context) error { err = lock.NewMutex(v.rdb.Rdb, c.TTL).Lock(ctx, c.Key, func(ctx context.Context) error {
order, err := v.OrderRepo.GetByOutBizNo(ctx, req.AppID, req.OutBizNo) order, err := v.OrderRepo.GetByOutBizNo(ctx, vo.OrderTypeCmb, req.AppID, req.OutBizNo)
if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) { if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
return err return err

3
internal/biz/repo/order.go
View File

@ -3,10 +3,11 @@ package repo
import ( import (
"context" "context"
"voucher/internal/biz/bo" "voucher/internal/biz/bo"
"voucher/internal/biz/vo"
) )
type OrderRepo interface { type OrderRepo interface {
GetByOutBizNo(ctx context.Context, appId, outBizNo string) (*bo.OrderBo, error) GetByOutBizNo(ctx context.Context, t vo.OrderType, appId, outBizNo string) (*bo.OrderBo, error)
GetByOrderNo(ctx context.Context, orderNo string) (*bo.OrderBo, error) GetByOrderNo(ctx context.Context, orderNo string) (*bo.OrderBo, error)
Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderBo, error) Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderBo, error)
GetByID(ctx context.Context, id uint64) (*bo.OrderBo, error) GetByID(ctx context.Context, id uint64) (*bo.OrderBo, error)

5
internal/data/repoimpl/order.go
View File

@ -37,6 +37,7 @@ func (p *OrderRepoImpl) Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderB
Account: req.Account, Account: req.Account,
AccountType: req.AccountType.GetValue(), AccountType: req.AccountType.GetValue(),
Status: vo.OrderStatusWait.GetValue(), Status: vo.OrderStatusWait.GetValue(),
Type: req.Type.GetValue(),
AppID: req.AppID, AppID: req.AppID,
MerchantNo: req.MerchantNo, MerchantNo: req.MerchantNo,
Channel: req.Channel.GetValue(), Channel: req.Channel.GetValue(),
@ -52,10 +53,10 @@ func (p *OrderRepoImpl) Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderB
return p.ToBo(info), nil return p.ToBo(info), nil
} }
func (p *OrderRepoImpl) GetByOutBizNo(ctx context.Context, appId, outBizNo string) (*bo.OrderBo, error) { func (p *OrderRepoImpl) GetByOutBizNo(ctx context.Context, t vo.OrderType, appId, outBizNo string) (*bo.OrderBo, error) {
info := &model.Order{} info := &model.Order{}
tx := p.DB(ctx).Where(model.Order{AppID: appId, OutBizNo: outBizNo}).Find(&info) tx := p.DB(ctx).Where(model.Order{Type: t.GetValue(), AppID: appId, OutBizNo: outBizNo}).Find(&info)
if tx.Error != nil { if tx.Error != nil {
return nil, tx.Error return nil, tx.Error

1
internal/service/cmb.go
View File

@ -82,6 +82,7 @@ func (s *VoucherService) cmbOrder(ctx http.Context) (string, error) {
Account: bizContent.CmbUid, Account: bizContent.CmbUid,
AppID: bizContent.AppId, AppID: bizContent.AppId,
AccountType: vo.OrderAccountTypeOpenId, AccountType: vo.OrderAccountTypeOpenId,
Type: vo.OrderTypeCmb,
} }
orderNo, err := s.VoucherBiz.CmbOrder(ctx, boReq) orderNo, err := s.VoucherBiz.CmbOrder(ctx, boReq)