From 581e3ee48a9b0acf18242df127a1db5a63f255db Mon Sep 17 00:00:00 2001
From: missish <2445921920@qq.com>
Date: Sat, 31 May 2025 10:40:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor(tool):=20=E4=B8=BADeepCopy=E5=92=8CSha?=
 =?UTF-8?q?llowCopy=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为copy工具函数添加了CopyOption配置选项，允许调用方自定义复制行为。主要修改包括：
1. 新增CopyOption函数类型和CopyWithIgnoreEmpty选项
2. 修改DeepCopy和ShallowCopy函数签名以支持可变选项参数
3. 重构内部实现以应用传入的选项配置

这使得调用方可以灵活控制是否忽略空值等复制行为，增强了工具函数的可配置性。
---
 .../admin/payment/updatePaymentMethodLogic.go |  2 +-
 pkg/tool/copy.go                              | 40 +++++++++++++++----
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/internal/logic/admin/payment/updatePaymentMethodLogic.go b/internal/logic/admin/payment/updatePaymentMethodLogic.go
index c3bf26e..87b4fd7 100644
--- a/internal/logic/admin/payment/updatePaymentMethodLogic.go
+++ b/internal/logic/admin/payment/updatePaymentMethodLogic.go
@@ -39,7 +39,7 @@ func (l *UpdatePaymentMethodLogic) UpdatePaymentMethod(req *types.UpdatePaymentM
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find payment method error: %s", err.Error())
 	}
 	config := parsePaymentPlatformConfig(l.ctx, payment.ParsePlatform(req.Platform), req.Config)
-	tool.DeepCopy(method, req)
+	tool.DeepCopy(method, req, tool.CopyWithIgnoreEmpty(false))
 	method.Config = config
 	if err := l.svcCtx.PaymentModel.Update(l.ctx, method); err != nil {
 		l.Errorw("update payment method error", logger.Field("id", req.Id), logger.Field("error", err.Error()))
diff --git a/pkg/tool/copy.go b/pkg/tool/copy.go
index 0dc629c..7d707c1 100644
--- a/pkg/tool/copy.go
+++ b/pkg/tool/copy.go
@@ -13,17 +13,28 @@ import (
 	"github.com/perfect-panel/server/pkg/constant"
 )
 
-func DeepCopy[T, K interface{}](destStruct T, srcStruct K) T {
+// CopyOption 定义复制选项的函数类型
+type CopyOption func(*copier.Option)
+
+// CopyWithIgnoreEmpty 设置是否忽略空值
+func CopyWithIgnoreEmpty(ignoreEmpty bool) CopyOption {
+	return func(o *copier.Option) {
+		o.IgnoreEmpty = ignoreEmpty
+	}
+}
+
+func DeepCopy[T, K any](destStruct T, srcStruct K, opts ...CopyOption) T {
 	var dst = destStruct
 	var src = srcStruct
-	_ = copier.CopyWithOption(dst, src, copier.Option{
+
+	option := copier.Option{
 		DeepCopy:    true,
 		IgnoreEmpty: true,
 		Converters: []copier.TypeConverter{
 			{
 				SrcType: time.Time{},
 				DstType: constant.Int64,
-				Fn: func(src interface{}) (interface{}, error) {
+				Fn: func(src any) (any, error) {
 					s, ok := src.(time.Time)
 					if !ok {
 						return nil, errors.New("src type not matching")
@@ -32,13 +43,21 @@ func DeepCopy[T, K interface{}](destStruct T, srcStruct K) T {
 				},
 			},
 		},
-	})
+	}
+
+	for _, opt := range opts {
+		opt(&option)
+	}
+
+	_ = copier.CopyWithOption(dst, src, option)
 	return dst
 }
-func ShallowCopy[T, K interface{}](destStruct T, srcStruct K) T {
+
+func ShallowCopy[T, K interface{}](destStruct T, srcStruct K, opts ...CopyOption) T {
 	var dst = destStruct
 	var src = srcStruct
-	_ = copier.CopyWithOption(dst, src, copier.Option{
+
+	option := copier.Option{
 		IgnoreEmpty: true,
 		Converters: []copier.TypeConverter{
 			{
@@ -46,7 +65,6 @@ func ShallowCopy[T, K interface{}](destStruct T, srcStruct K) T {
 				DstType: constant.Int64,
 				Fn: func(src interface{}) (interface{}, error) {
 					s, ok := src.(time.Time)
-
 					if !ok {
 						return nil, errors.New("src type not matching")
 					}
@@ -54,7 +72,13 @@ func ShallowCopy[T, K interface{}](destStruct T, srcStruct K) T {
 				},
 			},
 		},
-	})
+	}
+
+	for _, opt := range opts {
+		opt(&option)
+	}
+
+	_ = copier.CopyWithOption(dst, src, option)
 	return dst
 }