来访

app/admin/controller/goods/ServiceGoodsController.php

@@ -27,6 +27,11 @@ class ServiceGoodsController
         return GoodsService::selectList($request, 'SERVICE');
     }
 
+    public function selectPicking(Request $request)
+    {
+        return GoodsService::selectPicking($request);
+    }
+
     /**
      * @Desc 商品详情
      * @Author Gorden

app/admin/controller/member/VisitingController.php

@@ -44,7 +44,7 @@ class VisitingController extends Curd
     {
         $model = $this->model->with([
             'member' => function ($query) {
-                $query->select('member_id', 'member_mobile');
+                $query->where('member_is_owner','N')->select('member_id', 'member_mobile');
             },
             'cert' => function ($query) {
                 $query->select('join_cert_member_id', 'member_cert_name');
@@ -99,6 +99,9 @@ class VisitingController extends Curd
                 }
                 $item->wellness_record_file_json = $wellnessRecordFileJson;
             }
+            if (empty($item->member)){
+                unset($item);
+            }
         }
 
         return $items;

app/admin/service/goods/GoodsService.php

@@ -144,6 +144,53 @@ class GoodsService
         return json_success('', compact('rows', 'page', 'pageSize', 'total'));
     }
 
+    public static function selectPicking(Request $request)
+    {
+        $page = $request->get('page');
+        $pageSize = $request->get('pageSize');
+        $goodsName = $request->get('goods_name', '');
+
+        $rows = Goods::with([
+            'category' => function ($query) {
+                $query->select('category_id', 'category_name');
+            },
+            'running' => function ($query) {
+                $query->select('join_running_goods_id', 'goods_running_storage');
+            },
+            'supplier' => function ($query) {
+                $query->select('supplier_id', 'supplier_name');
+            }
+        ])->select('goods_id', 'join_goods_category_id', 'join_goods_supplier_id', 'goods_status', 'goods_sales_price', 'goods_category', 'goods_name', 'goods_title', 'goods_cover', 'goods_sort', 'goods_addtimes')
+            ->when($goodsName != '', function ($query) use ($goodsName) {
+                $query->where(function ($q) use ($goodsName) {
+                    $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                        ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+                });
+            })->where('goods_classify', 'SERVICE')
+            ->where('goods_category', 'FARM')
+            ->orderBy('goods_addtimes', 'DESC')
+            ->forPage($page, $pageSize)
+            ->get()
+            ->toArray();
+        $total = Goods::when($goodsName != '', function ($query) use ($goodsName) {
+            $query->where(function ($q) use ($goodsName) {
+                $q->where('goods_name', 'like', '%' . $goodsName . '%')
+                    ->OrWhere('goods_title', 'like', '%' . $goodsName . '%');
+            });
+        })->where('goods_classify', 'SERVICE')
+            ->where('goods_category', 'FARM')
+            ->count();
+
+        foreach ($rows as &$row) {
+            $row['goods_cover'] = getenv('STORAGE_DOMAIN') . $row['goods_cover'];
+            if (isset($row['running'])) {
+                $row['running']['goods_running_storage'] = intval($row['running']['goods_running_storage']);
+            }
+        }
+
+        return json_success('', compact('rows', 'page', 'pageSize', 'total'));
+    }
+
     public static function selectPackage(Request $request)
     {
         $page = $request->get('page');

route/admin.php

@@ -45,6 +45,7 @@ Route::group('/admin', function () {
         Route::group('/service', function () {
             Route::get('/list', [\app\admin\controller\goods\ServiceGoodsController::class, 'select']);
             Route::get('/selectList', [\app\admin\controller\goods\ServiceGoodsController::class, 'selectList']);
+            Route::get('/selectPicking', [\app\admin\controller\goods\ServiceGoodsController::class, 'selectPicking']);
             Route::get('/info', [\app\admin\controller\goods\ServiceGoodsController::class, 'info']);
             Route::post('/add', [\app\admin\controller\goods\ServiceGoodsController::class, 'insert']);
             Route::post('/update', [\app\admin\controller\goods\ServiceGoodsController::class, 'update']);