commit

app/admin/controller/store/StoreProduct.php

@@ -273,7 +273,7 @@ class StoreProduct extends AuthController
             ['items', []],
             ['attrs', []],
             ['activity', []],
-            ['store_type', 1]
+            ['store_type', 1],
         ]);
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {
@@ -287,6 +287,8 @@ class StoreProduct extends AuthController
         $data['activity'] = implode(',', $data['activity']);
         $detail = $data['attrs'];
         $data['price'] = min(array_column($detail, 'price'));
+        $data['min_integral'] = min(array_column($detail, 'integral'));
+        $data['max_integral'] = max(array_column($detail, 'integral'));
         $data['integral'] = min(array_column($detail, 'integral'));
         $data['ot_price'] = min(array_column($detail, 'ot_price'));
         $data['cost'] = min(array_column($detail, 'cost'));

app/admin/view/user/user/index.php

@@ -239,7 +239,7 @@
                                 <a href="javascript:void(0);" lay-event="see">
                                     <i class="layui-icon layui-icon-edit"></i> 会员详情</a>
                             </li>
-                            
+                        
                             <li>
                                 <a href="javascript:void(0);" lay-event="set_group">
                                     <i class="layui-icon layui-icon-star-fill" aria-hidden="true"></i> 设置分组</a>

app/api/controller/store/StoreProductController.php

@@ -230,6 +230,9 @@ class StoreProductController
         } else if ($type == 4) {//TODO 促销单品
             $info['banner'] = sys_data('routine_home_benefit_banner') ?: [];//TODO 促销单品推荐图片
             $info['list'] = StoreProduct::getBenefitProduct('id,image,store_name,cate_id,price,ot_price,stock,unit_name,sort');//TODO 促销单品
+        } else if ($type == 5) {//TODO 促销单品
+            $info['banner'] = sys_data('routine_home_benefit_banner') ?: [];//TODO 促销单品推荐图片
+            $info['list'] = StoreProduct::getBenefitProduct('max_integral,min_integral,id,image,store_name,cate_id,price,ot_price,stock,unit_name,sort');//TODO 促销单品
         }
         return app('json')->successful($info);
     }

app/models/store/StoreProduct.php

@@ -58,11 +58,20 @@ class StoreProduct extends BaseModel
         return htmlspecialchars_decode($value);
     }
 
-    public static function getValidProduct($productId, $field = 'add_time,browse,cate_id,code_path,cost,ficti,give_integral,id,image,is_sub,is_bargain,is_benefit,is_best,is_del,is_hot,is_new,is_postage,is_seckill,is_show,keyword,mer_id,mer_use,ot_price,postage,price,sales,slider_image,sort,stock,store_info,store_name,unit_name,vip_price,spec_type,IFNULL(sales,0) + IFNULL(ficti,0) as fsales,video_link')
+    public static function getIntegralProduct($field = '*', $limit = 0)
     {
-        $Product = self::where('is_del', 0)->where('is_show', 1)->where('id', $productId)->field($field)->find();
-        if ($Product) return $Product->toArray();
-        else return false;
+        $model = self::where('max_integral', '>', 0)
+            ->where('is_del', 0)->where('mer_id', 0)->where('stock', '>', 0)
+            ->where('is_show', 1)->field($field)
+            ->order('sort DESC, id DESC');
+        if ($limit) $model->limit($limit);
+        $data = $model->select();
+        if (count($data) > 0) {
+            foreach ($data as $k => $v) {
+                $data[$k]['activity'] = self::activity($v['id']);
+            }
+        }
+        return $data;
     }
 
     public static function getGoodList($limit = 18, $field = '*')
@@ -618,4 +627,7 @@ class StoreProduct extends BaseModel
         }
         return $data;
     }
+
+
+
 }