wesmiler 1 неделя назад
Родитель
Сommit
4a7c260a6f
2 измененных файлов с 3 добавлено и 5 удалено
  1. 1 1
      app/Models/AccountLogModel.php
  2. 2 4
      app/Services/Api/BalanceLogService.php

+ 1 - 1
app/Models/AccountLogModel.php

@@ -74,7 +74,7 @@ class AccountLogModel extends BaseModel
     {
         if($this->type==4){
             return BalanceLogModel::where(['order_no'=>$this->source_order_no,'mark'=>1])
-                ->select(['id','user_id','order_no','money','pay_at','pay_type','receive_status','total','fee','actual_money','type','pay_status','package_info','mch_id','batch_id','account_name','account','confirm_remark','transaction_id','confirm_at','create_time','status'])
+                ->select(['id','user_id','order_no','money','pay_at','pay_type','receive_status','total','fee','actual_money','pool_money','pt_money','type','pay_status','package_info','mch_id','batch_id','account_name','account','confirm_remark','transaction_id','confirm_at','create_time','status'])
                 ->first();
         }else if($this->store_id>0 && $this->type == 7){
             return OrderModel::with(['user'])->where(['order_no'=>$this->source_order_no,'mark'=>1])

+ 2 - 4
app/Services/Api/BalanceLogService.php

@@ -237,15 +237,13 @@ class BalanceLogService extends BaseService
                 return false;
             }
 
+            // 结算比例
             $rate = ConfigService::make()->getConfigByCode('withdraw_2_rate',0);
             $rate = $rate>0 && $rate<=100? $rate : 100;
             $total = moneyFormat($total * $price,2);
             $actualMoney = moneyFormat($total * $rate/100, 2);
 
-            // 结算比例
-            $rate = ConfigService::make()->getConfigByCode('withdraw_2_rate',0);
-            $rate = $rate>0 && $rate<=100? $rate : 100;
-            $actualMoney = moneyFormat($actualMoney * $rate/100, 2);
+
 
             // 底池比例
             $poolRate = ConfigService::make()->getConfigByCode('withdraw_2_back_rate',0);