1

app/api/controller/Coupon.php

@@ -12,9 +12,13 @@ declare (strict_types=1);
 
 namespace app\api\controller;
 
-use think\response\Json;
 use app\api\model\Coupon as CouponModel;
+use app\common\enum\coupon\TypeCase;
 use cores\exception\BaseException;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+use think\response\Json;
 
 /**
  * 优惠券中心
@@ -24,17 +28,33 @@ use cores\exception\BaseException;
 class Coupon extends Controller
 {
     /**
-     * 优惠券列表
+     * 优惠券列表-商品
      * @return Json
      * @throws BaseException
-     * @throws \think\db\exception\DataNotFoundException
+     * @throws DataNotFoundException
-     * @throws \think\db\exception\DbException
+     * @throws DbException
-     * @throws \think\db\exception\ModelNotFoundException
+     * @throws ModelNotFoundException
      */
     public function list(): Json
     {
         $model = new CouponModel;
-        $list = $model->getList();
+        $list = $model->getList(null, false, ['coupon_case' => TypeCase::SHOP]);
+        return $this->renderSuccess(compact('list'));
+    }
+
+    /**
+     * @notes:优惠券列表-服务
+     * @return Json
+     * @throws BaseException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author: wanghousheng
+     */
+    public function server(): Json
+    {
+        $model = new CouponModel;
+        $list = $model->getList(null, false, ['coupon_case' => TypeCase::SERVER]);
         return $this->renderSuccess(compact('list'));
     }
 }

app/api/model/Coupon.php

@@ -47,7 +47,7 @@ class Coupon extends CouponModel
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getList(int $limit = null, bool $onlyReceive = false)
+    public function getList(int $limit = null, bool $onlyReceive = false, array $where = [])
     {
         // 查询构造器
         $query = $this->getNewQuery();
@@ -61,6 +61,7 @@ class Coupon extends CouponModel
         // 优惠券列表
         $couponList = $query->where('status', '=', 1)
             ->where('is_delete', '=', 0)
+            ->where($where)
             ->order(['sort', 'create_time' => 'desc'])
             ->select();
         // 获取用户已领取的优惠券