Browse Source

余额支付订单

lizhen_gitee 3 months ago
parent
commit
fe5bc41d14
2 changed files with 4 additions and 3 deletions
  1. 2 1
      addons/shopro/controller/Pay.php
  2. 2 2
      addons/shopro/service/Wallet.php

+ 2 - 1
addons/shopro/controller/Pay.php

@@ -93,7 +93,8 @@ class Pay extends Common
             if ($order->status != $order::STATUS_PAID) {
                 $this->error('订单支付失败');
             }
-            $this->success('订单支付成功', $order);
+//            $this->success('订单支付成功', $order);
+            $this->success('订单支付成功');
         }
 
         if ($payment == 'offline' && $order_type == 'order') {

+ 2 - 2
addons/shopro/service/Wallet.php

@@ -64,7 +64,7 @@ class Wallet
             ]);
 
             // 钱包和积分记录存到 fastadmin 钱包积分记录表
-            if (in_array($type, ['money', 'score'])) {
+            /*if (in_array($type, ['money', 'score'])) {
                 $eventMap = (new WalletLog)->getEventMap();
                 $memo = $memo ?: $eventMap[$type][$event] ?? '';
                 if ($type === 'money') {
@@ -72,7 +72,7 @@ class Wallet
                 } else if ($type === 'score') {
                     ScoreLog::create(['user_id' => $user->id, 'score' => $amount, 'before' => $before, 'after' => $after, 'memo' => $memo]);
                 }
-            }
+            }*/
 
             // 账户变动事件
             $data = ['walletLog' => $walletLog, 'type' => $type];