From 346e6427a9fc3976de88019ce82b3f1394095c0e Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Fri, 25 Aug 2023 18:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=AE=B0=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=AD=E5=A5=96=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php              | 10 ++++++
 app/controller/Passport.php |  2 +-
 app/controller/User.php     | 70 +++++++++++++++++++++++++++++++++++--
 route/app.php               |  2 ++
 4 files changed, 81 insertions(+), 3 deletions(-)

diff --git a/app/common.php b/app/common.php
index 94c7636..0a223cf 100644
--- a/app/common.php
+++ b/app/common.php
@@ -83,4 +83,14 @@ function get_image_url($imageUrl):string
 {
     $url = config('filesystem.disks.public.url');
     return $url . DIRECTORY_SEPARATOR . $imageUrl;
+}
+
+/**
+ * 赋予符号
+ * @param $value
+ * @param $symbol
+ */
+function give_symbol(&$value,$symbol = '+')
+{
+    $value = $symbol . $value;
 }
\ No newline at end of file
diff --git a/app/controller/Passport.php b/app/controller/Passport.php
index 0ebc225..3299d9f 100644
--- a/app/controller/Passport.php
+++ b/app/controller/Passport.php
@@ -92,7 +92,7 @@ class Passport extends BaseController
 
             if ($user['status']) {
 
-                $userinfo = ['id' => $user['data']['id'], 'avatar' => $user['data']['avatar']];
+                $userinfo = ['id' => $user['data']['id'], 'avatar' => get_image_url($user['data']['avatar'])];
                 $token = ['token'=>signToken($userinfo)];
 
                 Cookie::delete($cookie_name);
diff --git a/app/controller/User.php b/app/controller/User.php
index 576c74d..c133f9b 100644
--- a/app/controller/User.php
+++ b/app/controller/User.php
@@ -56,14 +56,15 @@ class User extends BaseController
         $limit = $data['limit'] ?: 10;
 
         $list = Db::name('withdrawal_records')
-                  ->where('user_id',$userData['id'])
-                  ->field('withdrawal_amount,withdrawal_balence,apply_time')
+                  ->where(['user_id' => $userData['id'], 'status' => 1])
+                  ->field('withdrawal_amount,withdrawal_balance,apply_time')
                   ->order('id' ,'desc')
                   ->paginate($limit);
 
         $listArr = $list->items();
 
         foreach ($listArr as &$item) {
+            give_symbol($item['withdrawal_amount'],'-');
             $item['apply_time'] = date("m月d日 H:i",strtotime($item['apply_time']));
         }
 
@@ -95,6 +96,7 @@ class User extends BaseController
         $listArr = $list->items();
 
         foreach ($listArr as &$item) {
+            give_symbol($item['recharge_amount']);
             $item['recharge_time'] = date("m月d日 H:i",strtotime($item['recharge_time']));
         }
 
@@ -103,4 +105,68 @@ class User extends BaseController
             'total' => $list->total()
         ]);
     }
+
+    /**
+     * 消费记录
+     * @return array
+     * @throws \think\db\exception\DbException
+     */
+    public function consumptionRecords()
+    {
+        $userData = Session::get('login_user_data');
+
+        $data = Request::param();
+
+        $limit = $data['limit'] ?: 10;
+
+        $list = Db::name('consumption_records')
+                  ->where(['user_id' => $userData['id'],'status' => 1])
+                  ->field('actual_price,residue_amount,create_time')
+                  ->order('id' ,'desc')
+                  ->paginate($limit);
+
+        $listArr = $list->items();
+
+        foreach ($listArr as &$item) {
+            give_symbol($item['actual_price'],'-');
+            $item['create_time'] = date("m月d日 H:i",strtotime($item['create_time']));
+        }
+
+        return $this->renderSuccess('数据获取成功',[
+            'list' => $listArr,
+            'total' => $list->total()
+        ]);
+    }
+
+    /**
+     * 中奖记录
+     * @return array
+     * @throws \think\db\exception\DbException
+     */
+    public function awardsRecords()
+    {
+        $userData = Session::get('login_user_data');
+
+        $data = Request::param();
+
+        $limit = $data['limit'] ?: 10;
+
+        $list = Db::name('awards_records')
+                  ->where('user_id',$userData['id'])
+                  ->field('awards_amount,withdrawal_balance,create_time')
+                  ->order('id' ,'desc')
+                  ->paginate($limit);
+
+        $listArr = $list->items();
+
+        foreach ($listArr as &$item) {
+            give_symbol($item['awards_amount']);
+            $item['create_time'] = date("m月d日 H:i",strtotime($item['create_time']));
+        }
+
+        return $this->renderSuccess('数据获取成功',[
+            'list' => $listArr,
+            'total' => $list->total()
+        ]);
+    }
 }
\ No newline at end of file
diff --git a/route/app.php b/route/app.php
index 6a5f787..25da563 100644
--- a/route/app.php
+++ b/route/app.php
@@ -28,6 +28,8 @@ Route::group('user',function (){
     Route::post('modifyPassword','user/modifyPassword')->middleware(CheckToken::class);
     Route::post('withdrawalRecords','user/withdrawalRecords')->middleware(CheckToken::class);
     Route::post('rechargeRecords','user/rechargeRecords')->middleware(CheckToken::class);
+    Route::post('consumptionRecords','user/consumptionRecords')->middleware(CheckToken::class);
+    Route::post('awardsRecords','user/awardsRecords')->middleware(CheckToken::class);
 });