From 822ab544fe470a3b6569db0c94d69b8dacdfd7d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AD=90=E9=93=AD?= <zi__mm@163.com>
Date: Mon, 3 Mar 2025 18:23:04 +0800
Subject: [PATCH] cmb

---
 gorm.sh                                  |  12 +-
 internal/biz/bo/order_bo.go              |   3 +
 internal/biz/repo/order.go               |  15 +++
 internal/biz/repo/order_repo.go          |  13 ---
 internal/data/repoimpl/order.go          | 142 +++++++++++++++++++++++
 internal/data/repoimpl/order_repoImpl.go |  30 -----
 internal/service/cmb.go                  |   2 +
 7 files changed, 168 insertions(+), 49 deletions(-)
 create mode 100644 internal/biz/repo/order.go
 delete mode 100644 internal/biz/repo/order_repo.go
 create mode 100644 internal/data/repoimpl/order.go
 delete mode 100644 internal/data/repoimpl/order_repoImpl.go

diff --git a/gorm.sh b/gorm.sh
index 148f841..1775528 100755
--- a/gorm.sh
+++ b/gorm.sh
@@ -101,7 +101,7 @@ echo "领域实体Bo代码生成完成：${bo_file}"
 # 生成 CRUD 操作代码部分
 echo "正在生成 CRUD 操作代码..."
 
-repo_file="${repo_path}/${table}_repo.go"
+repo_file="${repo_path}/${table}.go"
 mkdir -p "${repo_path}"
 cat > "${repo_file}" <<EOL
 package repo
@@ -120,7 +120,7 @@ type ${table_capitalized}Repo interface {
 EOL
 
 
-crud_file="${repo_impl_path}/${table}_repoImpl.go"
+crud_file="${repo_impl_path}/${table}.go"
 mkdir -p "${repo_impl_path}"
 
 # 使用heredoc方式向文件中写入CRUD操作代码，定义了针对指定表的各种数据库操作方法，包括创建、根据ID获取、更新、删除、列表查询以及按字段查询等功能
@@ -130,17 +130,17 @@ package repoimpl
 import (
 	  "context"
     "voucher/internal/data/model"
-    "voucher/internal/biz/repository"
+    "voucher/internal/biz/repo"
     "voucher/internal/biz/bo"
 )
 
-// ${table_capitalized}RepoImpl 定义了针对 ${table_capitalized} 表的 CRUD 操作
+// ${table_capitalized}RepoImpl .
 type ${table_capitalized}RepoImpl struct {
    	Base[model.${table_capitalized}, bo.${table_capitalized}Bo]
 }
 
-// New${table_capitalized}RepoImpl 创建一个新的 ${table_capitalized}RepoImpl 实例
-func New${table_capitalized}RepoImpl() repository.${table_capitalized}Repo {
+// New${table_capitalized}RepoImpl .
+func New${table_capitalized}RepoImpl() repo.${table_capitalized}Repo {
     return &${table_capitalized}RepoImpl{}
 }
 
diff --git a/internal/biz/bo/order_bo.go b/internal/biz/bo/order_bo.go
index 66cbd5f..d84e2d7 100644
--- a/internal/biz/bo/order_bo.go
+++ b/internal/biz/bo/order_bo.go
@@ -22,11 +22,14 @@ type OrderBo struct {
 }
 
 type OrderCreateReqBo struct {
+	OrderNo     string
 	OutBizNo    string
 	ProductNo   string
 	Account     string
 	AccountType vo.OrderAccountType
 	Channel     vo.OrderChannel
+	AppID       string
+	MerchantNo  string
 }
 
 type OrderCreateRepBo struct {
diff --git a/internal/biz/repo/order.go b/internal/biz/repo/order.go
new file mode 100644
index 0000000..ebe7c67
--- /dev/null
+++ b/internal/biz/repo/order.go
@@ -0,0 +1,15 @@
+package repo
+
+import (
+	"context"
+	"voucher/internal/biz/bo"
+)
+
+type OrderRepo interface {
+	GetByOutBizNo(ctx context.Context, outBizNo string) (*bo.OrderBo, error)
+	Create(ctx context.Context, req *bo.OrderCreateReqBo) (*bo.OrderBo, error)
+	GetByID(ctx context.Context, id uint64) (*bo.OrderBo, error)
+	Ing(ctx context.Context, id uint64) error
+	Success(ctx context.Context, id uint64) error
+	Fail(ctx context.Context, id uint64) error
+}
diff --git a/internal/biz/repo/order_repo.go b/internal/biz/repo/order_repo.go
deleted file mode 100644
index cba40a9..0000000
--- a/internal/biz/repo/order_repo.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package repo
-
-import (
-	"context"
-	"voucher/internal/biz/bo"
-)
-
-type OrderRepo interface {
-	// Create 创建 CmbOrder
-	Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderBo, error)
-	// GetByID 根据 ID 获取 CmbOrder
-	GetByID(ctx context.Context, id int32) (*bo.OrderBo, error)
-}
diff --git a/internal/data/repoimpl/order.go b/internal/data/repoimpl/order.go
new file mode 100644
index 0000000..b1d9a59
--- /dev/null
+++ b/internal/data/repoimpl/order.go
@@ -0,0 +1,142 @@
+package repoimpl
+
+import (
+	"context"
+	"gorm.io/gorm"
+	"time"
+	"voucher/internal/biz/bo"
+	"voucher/internal/biz/repo"
+	"voucher/internal/biz/vo"
+	"voucher/internal/data"
+	"voucher/internal/data/model"
+)
+
+// OrderRepoImpl .
+type OrderRepoImpl struct {
+	Base[model.Order, bo.OrderBo]
+	db *data.Db
+}
+
+// NewOrderRepoImpl .
+func NewOrderRepoImpl() repo.OrderRepo {
+	return &OrderRepoImpl{}
+}
+
+func (p *OrderRepoImpl) DB(ctx context.Context) *gorm.DB {
+	return p.db.DB(ctx).Model(model.Order{})
+}
+
+func (p *OrderRepoImpl) Create(ctx context.Context, req *bo.OrderCreateReqBo) (*bo.OrderBo, error) {
+	now := time.Now()
+
+	info := &model.Order{
+		OrderNo:     req.OrderNo,
+		OutBizNo:    req.OutBizNo,
+		ProductNo:   req.ProductNo,
+		Account:     req.Account,
+		AccountType: req.AccountType.GetValue(),
+		Status:      vo.OrderStatusWait.GetValue(),
+		AppID:       req.AppID,
+		MerchantNo:  req.MerchantNo,
+		Channel:     req.Channel.GetValue(),
+		CreateTime:  &now,
+		UpdateTime:  &now,
+	}
+
+	tx := p.db.DB(ctx).Create(info)
+	if tx.Error != nil {
+		return nil, tx.Error
+	}
+
+	return p.ToBo(info), nil
+}
+
+func (p *OrderRepoImpl) GetByOutBizNo(ctx context.Context, outBizNo string) (*bo.OrderBo, error) {
+	info := &model.Order{}
+
+	tx := p.DB(ctx).Where(model.Order{OutBizNo: outBizNo}).Find(&info)
+
+	if tx.Error != nil {
+		return nil, tx.Error
+	}
+	if tx.RowsAffected == 0 {
+		return nil, gorm.ErrRecordNotFound
+	}
+
+	return p.ToBo(info), nil
+}
+
+func (p *OrderRepoImpl) GetByID(ctx context.Context, id uint64) (*bo.OrderBo, error) {
+	info := &model.Order{}
+
+	tx := p.DB(ctx).Where(model.Order{ID: id}).Find(&info)
+
+	if tx.Error != nil {
+		return nil, tx.Error
+	}
+	if tx.RowsAffected == 0 {
+		return nil, gorm.ErrRecordNotFound
+	}
+
+	return p.ToBo(info), nil
+}
+
+func (p *OrderRepoImpl) Ing(ctx context.Context, id uint64) error {
+	now := time.Now()
+
+	res := p.db.DB(ctx).
+		Where(model.Order{
+			ID:     id,
+			Status: vo.OrderStatusWait.GetValue(),
+		}).
+		Updates(model.Order{
+			Status:     vo.OrderStatusIng.GetValue(),
+			UpdateTime: &now,
+		})
+
+	if res.Error != nil {
+		return res.Error
+	}
+
+	return nil
+}
+
+func (p *OrderRepoImpl) Success(ctx context.Context, id uint64) error {
+	now := time.Now()
+
+	res := p.db.DB(ctx).
+		Where(model.Order{
+			ID:     id,
+			Status: vo.OrderStatusIng.GetValue(),
+		}).
+		Updates(model.Order{
+			Status:     vo.OrderStatusSuccess.GetValue(),
+			UpdateTime: &now,
+		})
+
+	if res.Error != nil {
+		return res.Error
+	}
+
+	return nil
+}
+
+func (p *OrderRepoImpl) Fail(ctx context.Context, id uint64) error {
+	now := time.Now()
+
+	res := p.db.DB(ctx).
+		Where(model.Order{
+			ID:     id,
+			Status: vo.OrderStatusIng.GetValue(),
+		}).
+		Updates(model.Order{
+			Status:     vo.OrderStatusFail.GetValue(),
+			UpdateTime: &now,
+		})
+
+	if res.Error != nil {
+		return res.Error
+	}
+
+	return nil
+}
diff --git a/internal/data/repoimpl/order_repoImpl.go b/internal/data/repoimpl/order_repoImpl.go
deleted file mode 100644
index 0f1131b..0000000
--- a/internal/data/repoimpl/order_repoImpl.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package repoimpl
-
-import (
-	"context"
-	"voucher/internal/biz/bo"
-	"voucher/internal/biz/repo"
-	"voucher/internal/data/model"
-)
-
-// OrderRepoImpl 定义了针对 CmbOrder 表的 CRUD 操作
-type OrderRepoImpl struct {
-	Base[model.Order, bo.OrderBo]
-}
-
-// NewOrderRepoImpl 创建一个新的 OrderRepoImpl 实例
-func NewOrderRepoImpl() repo.OrderRepo {
-	return &OrderRepoImpl{}
-}
-
-func (r *OrderRepoImpl) Create(ctx context.Context, req *bo.OrderBo) (*bo.OrderBo, error) {
-	// todo 待实现
-	return nil, nil
-}
-
-// GetByID 根据 ID 获取 CmbOrder
-func (r *OrderRepoImpl) GetByID(ctx context.Context, id int32) (*bo.OrderBo, error) {
-	var item model.Order
-	// todo 待实现
-	return r.ToBo(&item), nil
-}
diff --git a/internal/service/cmb.go b/internal/service/cmb.go
index 4dc176e..7668e23 100644
--- a/internal/service/cmb.go
+++ b/internal/service/cmb.go
@@ -14,6 +14,8 @@ func (s *VoucherService) CmbOrder(ctx http.Context) error {
 		return err
 	}
 
+	// todo 签名验证
+
 	boReq := &bo.OrderCreateReqBo{
 		OutBizNo:    req.TransactionId,
 		ProductNo:   req.ActivityId,