gorden 9 місяців тому
батько
коміт
91926dc8c5

+ 7 - 0
app/admin/controller/goods/EntityGoodsController.php

@@ -31,6 +31,13 @@ class EntityGoodsController
         return GoodsService::selectAll($goodsIds);
     }
 
+    public function selectAllByCategoryForRuleAddComponent(Request $request)
+    {
+        $category = $request->get('category', 'GOODS');
+
+        return GoodsService::selectAllByCategoryForRuleAddComponent($category);
+    }
+
     /**
      * @Desc 商品详情
      * @Author Gorden

+ 1 - 1
app/admin/controller/member/WellnessRecordController.php

@@ -316,7 +316,7 @@ class WellnessRecordController extends Curd
 
     public function visit($memberId)
     {
-        $query = $this->model->where('wellness_record_category', '来访')
+        $query = $this->model->where('wellness_record_category', 'Visiting')
             ->where('join_wellness_record_member_id', $memberId)
             ->orderBy('wellness_record_addtimes', 'desc');
         $paginator = $query->paginate(20);

+ 8 - 3
app/admin/service/goods/GoodsService.php

@@ -30,6 +30,11 @@ class GoodsService
         return json_success('', $goods);
     }
 
+    public static function selectAllByCategoryForRuleAddComponent($category = "GOODS")
+    {
+
+    }
+
     public static function select(Request $request, $classify = "GOODS")
     {
         $page = $request->get('page');
@@ -848,7 +853,7 @@ class GoodsService
         if (!$category) {
             throw new BusinessException("产品分类不存在~");
         }
-        if (empty($params['goods_category'])){
+        if (empty($params['goods_category'])) {
             $params['goods_category'] = $category->category_classify;
         }
 
@@ -957,7 +962,7 @@ class GoodsService
                     foreach ($item1['items'] as $item2) {
                         $newParams = [];
                         foreach ($item2['params'] as $param) {
-                            if (!empty($param[0]) || !empty($param[1])){
+                            if (!empty($param[0]) || !empty($param[1])) {
                                 $newParams[] = $param;
                             }
                         }
@@ -1243,7 +1248,7 @@ class GoodsService
                     foreach ($item1['items'] as $item2) {
                         $newParams = [];
                         foreach ($item2['params'] as $param) {
-                            if (!empty($param[0]) || !empty($param[1])){
+                            if (!empty($param[0]) || !empty($param[1])) {
                                 $newParams[] = $param;
                             }
                         }