浏览代码

完善功能

gorden 8 月之前
父节点
当前提交
8214a18383
共有 3 个文件被更改,包括 9 次插入3 次删除
  1. 1 1
      app/admin/controller/goods/PackageGoodsController.php
  2. 6 1
      app/admin/service/goods/GoodsService.php
  3. 2 1
      composer.json

+ 1 - 1
app/admin/controller/goods/PackageGoodsController.php

@@ -32,7 +32,7 @@ class PackageGoodsController
      */
     public function selectList(Request $request)
     {
-        return GoodsService::selectList($request);
+        return GoodsService::selectList($request,"NOPACKAGE");
     }
 
     /**

+ 6 - 1
app/admin/service/goods/GoodsService.php

@@ -439,7 +439,12 @@ class GoodsService
                 $query->where('goods_name', 'like', "%" . $keywords . "%");
             })
             ->when($goodsClassify != '', function ($query) use ($goodsClassify) {
-                $query->where('goods_classify', $goodsClassify);
+                if($goodsClassify == 'NOPACKAGE'){
+                    $query->where('goods_classify','<>', 'PACKAGE');
+                }else{
+                    $query->where('goods_classify', $goodsClassify);
+                }
+                
             })
             ->when($isSupportAppointment != '', function ($query) use ($isSupportAppointment) {
                 $query->where('is_support_appointment', $isSupportAppointment);

+ 2 - 1
composer.json

@@ -39,7 +39,8 @@
     "tinywan/storage": "^1.0",
     "workerman/crontab": "^1.0",
     "overtrue/easy-sms": "^2.6",
-    "hhink/webman-sms": "^1.0"
+    "hhink/webman-sms": "^1.0",
+    "ldy/payment": "^3.6"
   },
   "suggest": {
     "ext-event": "For better performance. "