From 80c95a5b55f23b1edfffc50a939a0076fe20003f Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Mon, 11 Sep 2023 18:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=96=B0=E5=A2=9E=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/User.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controller/User.php b/app/controller/User.php
index 1d44562..ace2d23 100644
--- a/app/controller/User.php
+++ b/app/controller/User.php
@@ -3,8 +3,10 @@ namespace app\controller;
 
 use app\BaseController;
 use app\middleware\CheckUser;
+use app\model\ConsumptionRecords;
 use app\model\CustomerService as CustomerServiceModel;
 use app\model\User as UserModel;
+use app\model\ZoneGoods;
 use app\validate\User as UserValidate;
 use think\exception\ValidateException;
 use think\facade\Cache;
@@ -60,13 +62,15 @@ class User extends BaseController
 
         $list = Db::name('withdrawal_records')
                   ->where(['user_id' => $userData['id'], 'status' => 1])
-                  ->field('withdrawal_amount,withdrawal_balance,apply_time')
+                  ->field('withdrawal_amount,withdrawal_balance,apply_time,trade_type')
                   ->order('id' ,'desc')
                   ->paginate($limit);
 
         $listArr = $list->items();
 
+        $trade_type = [1 => '代理下分', 2 => '管理员下分', 3 => '支付宝'];
         foreach ($listArr as &$item) {
+            $item['trade_type'] = $trade_type[$item['trade_type']];
             give_symbol($item['withdrawal_amount'],'-');
             $item['apply_time'] = date("m月d日 H:i",strtotime($item['apply_time']));
         }
@@ -159,13 +163,16 @@ class User extends BaseController
 
         $list = Db::name('awards_records')
                   ->where('user_id',$userData['id'])
-                  ->field('awards_amount,withdrawal_balance,create_time')
+                  ->field('cr_id,awards_amount,withdrawal_balance,create_time')
                   ->order('id' ,'desc')
                   ->paginate($limit);
 
         $listArr = $list->items();
 
         foreach ($listArr as &$item) {
+            $ConsumptionRecords = ConsumptionRecords::find($item['cr_id']);
+            $ZoneGoods = ZoneGoods::find($ConsumptionRecords->zone_goods_id);
+            $item['zone_title'] = $ZoneGoods->title;
             give_symbol($item['awards_amount']);
             $item['create_time'] = date("m月d日 H:i",strtotime($item['create_time']));
         }