yjp 1 год назад
Родитель
Сommit
29eac0d91c
1 измененных файлов с 20 добавлено и 20 удалено
  1. 20 20
      convenient/entity_crud/service.go

+ 20 - 20
convenient/entity_crud/service.go

@@ -35,12 +35,12 @@ func Create(tableName string, callbacks *CreateCallbacks) binding.ServiceFunc[st
 			return callbackOnCreateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
 
-		prepared, err := callbackPrepareCreate(callbacks, e, i)
+		err = e.ForCreate()
 		if err != nil {
 			return callbackOnCreateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
 
-		err = e.ForCreate()
+		prepared, err := callbackPrepareCreate(callbacks, e, i)
 		if err != nil {
 			return callbackOnCreateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
@@ -82,12 +82,12 @@ func Delete(tableName string, callbacks *DeleteCallbacks) binding.ServiceFunc[an
 			return nil, errors.New("需要传递领域对象应该为实体")
 		}
 
-		prepared, err := callbackPrepareDelete(callbacks, e, i)
+		err := e.ForDelete()
 		if err != nil {
 			return nil, callbackOnDeleteErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
 
-		err = e.ForDelete()
+		prepared, err := callbackPrepareDelete(callbacks, e, i)
 		if err != nil {
 			return nil, callbackOnDeleteErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
@@ -125,12 +125,7 @@ func Update(tableName string, callbacks *UpdateCallbacks) binding.ServiceFunc[an
 			return nil, errors.New("需要传递领域对象应该为实体")
 		}
 
-		prepared, err := callbackPrepareUpdate(callbacks, e, i)
-		if err != nil {
-			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), err, i)
-		}
-
-		err = e.ForUpdate()
+		err := e.ForUpdate()
 		if err != nil {
 			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
@@ -148,6 +143,11 @@ func Update(tableName string, callbacks *UpdateCallbacks) binding.ServiceFunc[an
 			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
 
+		prepared, err := callbackPrepareUpdate(callbacks, e, i)
+		if err != nil {
+			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), err, i)
+		}
+
 		err = callbackBeforeUpdate(callbacks, e, prepared, i, nil)
 		if err != nil {
 			return nil, callbackOnUpdateErrorReturn(callbacks, e, prepared, err, i)
@@ -325,12 +325,12 @@ func CreateTx(tableName string, callbacks *CreateCallbacks) binding.ServiceFunc[
 			return callbackOnCreateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
 
-		prepared, err := callbackPrepareCreate(callbacks, e, i)
+		err = e.ForCreate()
 		if err != nil {
 			return callbackOnCreateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
 
-		err = e.ForCreate()
+		prepared, err := callbackPrepareCreate(callbacks, e, i)
 		if err != nil {
 			return callbackOnCreateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
@@ -379,12 +379,12 @@ func DeleteTx(tableName string, callbacks *DeleteCallbacks) binding.ServiceFunc[
 			return nil, errors.New("需要传递领域对象应该为实体")
 		}
 
-		prepared, err := callbackPrepareDelete(callbacks, e, i)
+		err := e.ForDelete()
 		if err != nil {
 			return nil, callbackOnDeleteErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
 
-		err = e.ForDelete()
+		prepared, err := callbackPrepareDelete(callbacks, e, i)
 		if err != nil {
 			return nil, callbackOnDeleteErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
@@ -429,12 +429,7 @@ func UpdateTx(tableName string, callbacks *UpdateCallbacks) binding.ServiceFunc[
 			return nil, errors.New("需要传递领域对象应该为实体")
 		}
 
-		prepared, err := callbackPrepareUpdate(callbacks, e, i)
-		if err != nil {
-			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), err, i)
-		}
-
-		err = e.ForUpdate()
+		err := e.ForUpdate()
 		if err != nil {
 			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), err, i)
 		}
@@ -451,6 +446,11 @@ func UpdateTx(tableName string, callbacks *UpdateCallbacks) binding.ServiceFunc[
 			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), errors.New(e.DomainCNName()+"不存在"), i)
 		}
 
+		prepared, err := callbackPrepareUpdate(callbacks, e, i)
+		if err != nil {
+			return nil, callbackOnUpdateErrorReturn(callbacks, e, make(map[string]any), err, i)
+		}
+
 		err = database.Transaction(dbExecutor, func(tx database.Executor) error {
 			err = callbackBeforeUpdate(callbacks, e, prepared, i, tx)
 			if err != nil {