up - UI数据

app/api/lists/UserEquityLists.php

@@ -20,11 +20,23 @@ class UserEquityLists  extends BaseApiDataLists
 
    public function  lists():array
    {
-       return UserEquity::with(['equityConfig'])->where($this->queryWhere())
+       $list = UserEquity::with(['equityConfig'=>function ($query) {
+                   $query->field(['*']);
+               },'goods'=>function ($query) {
+                   $query->field(['id','goods_name']);
+               }])->where($this->queryWhere())
+           ->field(['id','user_id','equity_id','goods_id','number','end_time'])
            ->limit($this->limitOffset, $this->limitLength)
-           ->order('create_time desc')
+           ->order('end_time')
            ->select()
            ->toArray();
+       /*foreach ($list as &$item) {
+           $item['all_num'] = $item['equityConfig']['number'];
+           $item['price'] = $item['equityConfig']['price'];
+           $item['equity_name'] = $item['equityConfig']['equity_name'];
+           $item['goods_name'] = $item['goods']['goods_name'];
+       }*/
+       return $list;
    }
 
     public function count(): int

app/common/model/equity/UserEquity.php

@@ -2,6 +2,7 @@
 
 namespace app\common\model\equity;
 use app\common\model\BaseModel;
+use app\common\model\goods\Goods;
 
 class UserEquity extends BaseModel
 {
@@ -11,4 +12,9 @@ class UserEquity extends BaseModel
     {
         return $this->hasOne(EquityConfig::class, 'id', 'equity_id');
     }
+
+    public function goods()
+    {
+        return $this->hasOne(Goods::class, 'id', 'goods_id');
+    }
 }