afa 7 月之前
父节点
当前提交
e6bda39c23
共有 2 个文件被更改,包括 5 次插入4 次删除
  1. 1 1
      application/api/controller/Pledge.php
  2. 4 3
      application/common/logic/PledgeLogic.php

+ 1 - 1
application/api/controller/Pledge.php

@@ -34,7 +34,7 @@ class Pledge extends Api
             $list = $productPledges
                   ->where('status', $productPledges::Normal)
                   ->where('to_lang', $this->lan)->where('type_id', $type_id)
-                  ->field('id,title,day_num,income_reta,product_id')
+                  ->field('id,title,day_num,income_reta,product_id,type_id')
                   ->order('weigh desc')
                   ->paginate($this->pageSize);
 

+ 4 - 3
application/common/logic/PledgeLogic.php

@@ -20,10 +20,11 @@ class PledgeLogic
     public  static function getByProductIdList(object $list, string $lan = 'zh')
     {
         $model  = Loader::model('ProductLists');
+
         foreach ($list as &$item) {
-            $item['product_list'] = $model->whereIn('id', $item->product_id)
-            ->orderRaw('field(id,'. $item->product_id.')')
-            ->column('id,thum,'.$lan.'_name as name');
+            $item['product_list'] = $model->whereIn('id', $item->product_id);
+            if($item->type_id == ProductPledges::Combin) $item['product_list'] = $model->orderRaw('field(id,'. $item->product_id.')');
+            $item['product_list'] = $model->column('id,thum,'.$lan.'_name as name');
         }
         return $list;
     }