feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐

application/admin/controller/shopro/user/WalletLog.php

@@ -65,12 +65,26 @@ class WalletLog extends Common
     }
 
     /**
-     * 佣金记录
+     * 佣金与收益记录
      */
     public function commission($id)
     {
         $list_rows = $this->request->param('list_rows', 10);
-        $walletLogs = WalletLogModel::where('user_id', $id)->commission()->order('id', 'desc')->paginate($list_rows);
+        $rewardEvents = [
+            'push3', 'maker_diff', 'maker_peer', 'maker_overtaken',
+            'team_venue', 'team_county', 'venue_peer', 'county_peer',
+            'venue_share', 'county_share', 'reward_income', 'transfer_by_commission', 'transfer_to_money'
+        ];
+
+        $walletLogs = WalletLogModel::where('user_id', $id)
+            ->where(function ($query) use ($rewardEvents) {
+                $query->where('type', 'commission')
+                      ->whereOr(function ($sub) use ($rewardEvents) {
+                          $sub->where('type', 'money')->whereIn('event', $rewardEvents);
+                      });
+            })
+            ->order('id', 'desc')
+            ->paginate($list_rows);
 
         // 多态关联 oper
         $morphs = [