修改前置、后置出来逻辑

Mattoids · Jun 30, 2024 · f606c59 · f606c59
1 parent cb8f4be
commit f606c59
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/Controller/BuyGoodsController.php b/src/Controller/BuyGoodsController.php
@@ -76,7 +76,8 @@ protected function data(ServerRequestInterface $request, Document $document) {
         }
 
         $validate = StoreExtend::getValidate($store->code);
-        if ($validate && !$validate->validate($actor, $store, $params, $this->translator, $this->settings, $this->events, $this->cache)) {
+        // $this->translator, $this->settings, $this->events, $this->cache
+        if ($validate && !$validate->validate($actor, $store, $params)) {
             throw new ValidationException(['message' => $this->translator->trans('mattoid-store.forum.error.validate-fail')]);
         }
 
@@ -117,7 +118,8 @@ protected function data(ServerRequestInterface $request, Document $document) {
         $after = StoreExtend::getAfter($store->code);
         if ($after) {
             // 商品处理失败，通知购买失败事件进行回滚操作
-            if (!$after->after($actor, $store, $params, $this->translator, $this->settings, $this->events, $this->cache)) {
+            // $this->translator, $this->settings, $this->events, $this->cache
+            if (!$after->after($actor, $store, $params)) {
                 $this->events->dispatch(new StoreBuyFailEvent($user, $store, $cart, $params));
                 throw new ValidationException(['message' => $this->translator->trans('mattoid-store.forum.error.buy-goods-fail', ['title' => $store->title])]);
             }

diff --git a/src/Goods/After.php b/src/Goods/After.php
@@ -12,5 +12,5 @@
 abstract class After
 {
 
-    abstract static function after(User $user, StoreModel $store, $params, Translator $translator = null, SettingsRepositoryInterface $settings = null, Dispatcher $events = null, CacheContract $cache = null);
+    abstract static function after(User $user, StoreModel $store, $params);
 }
diff --git a/src/Goods/Validate.php b/src/Goods/Validate.php
@@ -15,5 +15,5 @@ abstract class Validate
      * @param array $params 购买入参
      * @return boolean 返回 true-验证成功 false-验证失败
      */
-    abstract static function validate(User $user, StoreModel $store, $params, Translator $translator = null, SettingsRepositoryInterface $settings = null, Dispatcher $events = null, CacheContract $cache = null);
+    abstract static function validate(User $user, StoreModel $store, $params);
 }