lyh 2 лет назад
Родитель
Сommit
18d94ccfcd
2 измененных файлов с 7 добавлено и 1 удалено
  1. 1 1
      app/Services/Api/AcceptorService.php
  2. 6 0
      app/Services/Api/GoodsCategoryService.php

+ 1 - 1
app/Services/Api/AcceptorService.php

@@ -1185,7 +1185,7 @@ class AcceptorService extends BaseService
             return false;
         }
 
-        // 扣除用户
+        // 扣除用户
         $updateData = ['balance' => DB::raw("balance - {$params['quota']}"), 'update_time' => time()];
         if (!MemberModel::where(['id' => $userId])->update($updateData)) {
             $this->error = 2036;

+ 6 - 0
app/Services/Api/GoodsCategoryService.php

@@ -87,6 +87,12 @@ class GoodsCategoryService extends BaseService
                     $query->where('a.merch_id', $merchId);
                 }
 
+                // 商户
+                $ids = isset($params['ids']) ? $params['ids'] : 0;
+                if (count($ids) > 0) {
+                    $query->whereIn('a.id', $ids);
+                }
+
             })
             ->where(function ($query) use ($params) {
                 $keyword = isset($params['kw']) ? $params['kw'] : '';