1

app/api/controller/admin/StoreOrderController.php

@@ -95,6 +95,22 @@ class StoreOrderController
         else return app('json')->fail(Card::getErrorInfo('赠送失败'));
     }
 
+    public function sendCardList(Request $request)
+    {
+        $uid = $request->uid();
+        $info = SystemStoreStaff::where('uid', $uid)->where('status', 1)->find();
+        if (!$info) {
+            return app('json')->fail('权限不足');
+        }
+        $where = UtilService::getMore(['page', 'limit', 'status']);
+        $where['store_id'] = $info['store_id'];
+        $list = Card::systemPage($where);
+        unset($where['page']);
+        unset($where['limit']);
+        $count = Card::where($where)->count();
+        return app('json')->success('ok', compact('list', 'count'));
+    }
+
 
     public function checkCard(Request $request)
     {

app/models/store/Card.php

@@ -42,7 +42,8 @@ class Card extends BaseModel
         $model = new self;
         $model = $model->alias('s');
         if ($where['status'] != '') $model = $model->where('s.status', $where['status']);
-        if ($where['name'] != '') $model = $model->where('s.name|s.code', 'LIKE', "%$where[name]%");
+        if (isset($where['store_id']) && $where['store_id'] != '') $model = $model->where('s.store_id', $where['store_id']);
+        if (isset($where['name']) && $where['name'] != '') $model = $model->where('s.name|s.code', 'LIKE', "%$where[name]%");
         $model = $model->page(bcmul($where['page'], $where['limit'], 0), $where['limit']);
         $model = $model->order('s.id desc');
         return self::page($model, function ($item) {

route/api/route.php

@@ -62,6 +62,7 @@ Route::group(function () {
     Route::post('admin/point/:id', 'admin.StoreOrderController/addDetail')->name('addDetail');//添加/修改自提点
     Route::delete('admin/point/:id', 'admin.StoreOrderController/point_delete')->name('point_delete');//删除/回复自提点
     Route::post('admin/card/send', 'admin.StoreOrderController/sendCard')->name('sendCard');//删除/回复自提点
+    Route::get('admin/card/send', 'admin.StoreOrderController/sendCardList')->name('sendCardList');//删除/回复自提点
     Route::post('admin/card/check', 'admin.StoreOrderController/checkCard')->name('checkCard');//删除/回复自提点
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true)->middleware(\app\http\middleware\CustomerMiddleware::class);