Merge remote-tracking branch 'origin/prod' into dev

* origin/prod:
  1
  1
  1
  1
  1

app/Module/GameItems/AdminControllers/TransactionLogController.php

@@ -81,7 +81,7 @@ class TransactionLogController extends AdminController
                 $helper->equal('user_id', '用户ID');
 
 
-                $helper->equalSelectModelChestItem('item_id');
+                $helper->equalSelectModelItem('item_id');
 
                 $helper->equal('instance_id', '实例ID');
                 $filter->equal('transaction_type', '交易类型')->select(TRANSACTION_TYPE::all());

app/Module/Transfer/Events/FeeCalculatedEvent.php

@@ -5,6 +5,7 @@ namespace App\Module\Transfer\Events;
 use App\Module\Transfer\Models\TransferApp;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
+use UCore\Helper\Logger;
 
 /**
  * 手续费计算完成事件
@@ -121,6 +122,7 @@ class FeeCalculatedEvent
      */
     public static function fromCalculatingEvent(FeeCalculatingEvent $calculatingEvent): static
     {
+        Logger::debug('fromCalculatingEvent'." {$calculatingEvent->amount}, {$calculatingEvent->feeAmount}");
         if ($calculatingEvent->type == 'in') {
             // 转入
             $actualAmount = bcsub($calculatingEvent->amount, $calculatingEvent->feeAmount, 10);
@@ -131,10 +133,11 @@ class FeeCalculatedEvent
             $totleAmout   = bcadd($calculatingEvent->amount, $calculatingEvent->feeAmount, 10);
         }
         if($calculatingEvent->feeAmount > 0){
-            $feeRate = bcdiv($calculatingEvent->amount, $calculatingEvent->feeAmount, 10);
+            $feeRate = bcdiv($calculatingEvent->feeAmount * 100,$calculatingEvent->amount, 4) ;
         }else{
             $feeRate = 0;
         }
+        Logger::debug('fromCalculatingEvent feerate'." {$calculatingEvent->amount}, {$calculatingEvent->feeAmount} ,$feeRate");
 
         return new static(
             app:                $calculatingEvent->app,