From 6aaf02c5a0e5c4b2edecde704f9eaac431630123 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sun, 21 Jan 2024 14:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BA=A2=E5=8C=85=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/StoreActivityUserDao.php | 6 ++++--
 app/common/model/user/UserBill.php            | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/common/dao/store/StoreActivityUserDao.php b/app/common/dao/store/StoreActivityUserDao.php
index 65d93a5f..2a99f9d6 100644
--- a/app/common/dao/store/StoreActivityUserDao.php
+++ b/app/common/dao/store/StoreActivityUserDao.php
@@ -183,11 +183,13 @@ class StoreActivityUserDao extends BaseDao
             ->whereIn('type', $type)
             ->where('status', StoreConsumptionUser::STATUS_UNUSED)
             ->sum('balance');
-        $query = UserBill::where('uid', $userId)
+        $query = UserBill::with('storeConsumptionUser')
+            ->field('link_id,create_time')
+            ->where('uid', $userId)
             ->where('category', 'red_pack')
             ->where('type', "red_pack_{$type}");
         $count = $query->count();
-        $record = $query->page($page)->limit($limit)->select();
+        $record = $query->page($page)->limit($limit)->select()->toArray();
         return ['total_amount' => $totalAmount, 'count' => $count, 'record' => $record];
     }
 
diff --git a/app/common/model/user/UserBill.php b/app/common/model/user/UserBill.php
index cc5a7ca5..2fbd531f 100644
--- a/app/common/model/user/UserBill.php
+++ b/app/common/model/user/UserBill.php
@@ -15,6 +15,7 @@ namespace app\common\model\user;
 
 
 use app\common\model\BaseModel;
+use app\common\model\store\consumption\StoreConsumptionUser;
 
 class UserBill extends BaseModel
 {
@@ -44,4 +45,9 @@ class UserBill extends BaseModel
         return $this->hasOne(User::class, 'uid', 'uid');
     }
 
+    public function storeConsumptionUser()
+    {
+        return $this->hasOne(StoreConsumptionUser::class, 'coupon_user_id', 'link_id')->bind(['order_amount', 'coupon_price']);
+    }
+
 }