diff --git a/app/admin/controller/goods/Subsidy.php b/app/admin/controller/goods/Subsidy.php index 0d5024a9..39120d2e 100644 --- a/app/admin/controller/goods/Subsidy.php +++ b/app/admin/controller/goods/Subsidy.php @@ -14,7 +14,8 @@ class Subsidy extends AdminBase { if ($this->request->isAjax()) { $get = $this->request->get(); - return JsonServer::success('获取成功', SubsidyLogic::lists($get)); + $lists = (new GoodsSubsidy())->getSubsidy($get); + return JsonServer::success('获取成功', $lists); } return view('', [ diff --git a/app/admin/logic/goods/SubsidyLogic.php b/app/admin/logic/goods/SubsidyLogic.php index 70f03b3d..e2f84419 100755 --- a/app/admin/logic/goods/SubsidyLogic.php +++ b/app/admin/logic/goods/SubsidyLogic.php @@ -16,26 +16,6 @@ use think\facade\Db; */ class SubsidyLogic extends Logic { - // 列表 - public static function lists($get) - { - $lists = GoodsSubsidy::where('is_delete', 0) - ->order('id desc') - ->paginate([ - 'list_rows'=> $get['limit'], - 'page'=> $get['page'], - ]); - - foreach ($lists as &$v) { - $v['profit'] = self::formatStr($v['profit']); - $v['discount'] = self::formatStr($v['discount']); - $v['subsidy'] = self::formatStr($v['subsidy']); - } - - return ['count' => $lists->total(), 'lists' => $lists->getCollection()]; - } - - // 添加返补比例设置 public static function add($post) {