From 23d9b56d33875d1bb75273a022e9537f0f8f854e Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Fri, 6 Dec 2024 16:20:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=A8=E6=88=B7=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=94=9F=E6=B4=BB=E4=BB=98=E6=AC=BE=E8=B7=B3=E8=BD=AC=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/Billions.php | 5 +++--
 app/api/logic/BillionsLogic.php | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/api/controller/Billions.php b/app/api/controller/Billions.php
index 48030dcf..9a1642fc 100755
--- a/app/api/controller/Billions.php
+++ b/app/api/controller/Billions.php
@@ -27,11 +27,12 @@ class Billions extends Api
         $page = $this->request->get('page_no', $this->page_no);
         $size = $this->request->get('page_size', $this->page_size);
         $state = $this->request->get('state', 0);
-        $list = BillionsLogic::lists($page, $size, $state, $this->user_id);
+        $user_id = $this->request->get('state', 0);
+        $list = BillionsLogic::lists($page, $size, $state, $user_id);
         foreach($list['list'] as $key=>$value){
             $ranking = BillionsLogic::getRanking($value['billions_id']);
             $list['list'][$key]['ranking'] = $ranking;
-            BillionsLogic::checkBillions($value['billions_id'],$ranking,$this->user_id);
+            BillionsLogic::checkBillions($value['billions_id'],$ranking,$user_id);
         }
         return JsonServer::success('获取成功', $list);
     }
diff --git a/app/api/logic/BillionsLogic.php b/app/api/logic/BillionsLogic.php
index 3ad140f0..395fb162 100755
--- a/app/api/logic/BillionsLogic.php
+++ b/app/api/logic/BillionsLogic.php
@@ -161,8 +161,8 @@ class BillionsLogic extends Logic
                             ->dec("residue_price",$dec_price)
                             ->update();
                     }
-//                    Db::name("user_billions_surplus_log")
-//                        ->save($d);
+                    Db::name("user_billions_surplus_log")
+                        ->save($d);
                     $my_billions =  Db::name("user_billions")->where("billions_id",$billion)->where("state",0)->find();
                     if($my_billions!=null){
                         if($my_billions['order_price'] <= $d['price']+ $my_billions['subsidy_price']){