From ed82bcf44a70663078a8f14d0c189e166191dda7 Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Fri, 6 Dec 2024 23:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=89=8D=E6=B6=88=E8=B4=B9=E8=BF=94?=
 =?UTF-8?q?=E8=A1=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Billions.php | 2 ++
 app/api/logic/BillionsLogic.php | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/Billions.php b/app/api/controller/Billions.php
index f0af9912..7b0fb2f3 100755
--- a/app/api/controller/Billions.php
+++ b/app/api/controller/Billions.php
@@ -296,6 +296,7 @@ class Billions extends Api
                 $dat['way'] = 4;
                 $dat['type'] = 1;
                 $dat['money'] = $money;
+                $dat['take_money'] = $money;
                 $dat['create_time'] = date("Y-m-d H:i:s");
                 // 插入提现记录
                 $first_save_record = Db::name("subsidy_withdrawal_record")->save($dat);
@@ -315,6 +316,7 @@ class Billions extends Api
                 $dat['way'] = 4;
                 $dat['type'] = 1;
                 $dat['money'] = $money ;
+                $dat['take_money'] = $money;
                 $dat['create_time'] = date("Y-m-d H:i:s");
                 // 插入提现记录
                 $first_save_record = Db::name("subsidy_withdrawal_record")->save($dat);
diff --git a/app/api/logic/BillionsLogic.php b/app/api/logic/BillionsLogic.php
index 1cafe29b..eb5355bc 100755
--- a/app/api/logic/BillionsLogic.php
+++ b/app/api/logic/BillionsLogic.php
@@ -1103,7 +1103,11 @@ class BillionsLogic extends Logic
         ])->count();
 
         foreach($list as &$item) {
-            $item['desc'] = '提现微信￥' . number_format($item['money'], 2) . ', 手续费: ' . $item['commission'] . '%, 实际到账 ￥' . $item['take_money'];
+            if($item['way'] == 4){
+                $item['desc'] = '提前消费￥' . number_format($item['money'], 2) . ', 手续费: ' . $item['commission'] . '%, 实际到账 ￥' . $item['take_money'];
+            }else{
+                $item['desc'] = '提现微信￥' . number_format($item['money'], 2) . ', 手续费: ' . $item['commission'] . '%, 实际到账 ￥' . $item['take_money'];
+            }
         }
 
         $result = [