|
@@ -23,6 +23,9 @@ class CouponDetailController extends Curd
|
|
public function select(Request $request): Response
|
|
public function select(Request $request): Response
|
|
{
|
|
{
|
|
[$where, $format, $limit, $field, $order] = $this->selectInput($request);
|
|
[$where, $format, $limit, $field, $order] = $this->selectInput($request);
|
|
|
|
+ if (empty($where['coupon_detail_status'])) {
|
|
|
|
+ $where['coupon_detail_status'] = ['<>', 'DISABLED'];
|
|
|
|
+ }
|
|
// $where['join_coupon_detail_member_id'] = ['<>', ''];
|
|
// $where['join_coupon_detail_member_id'] = ['<>', ''];
|
|
$order = $request->get('order', 'desc');
|
|
$order = $request->get('order', 'desc');
|
|
$field = $field ?? 'coupon_detail_addtimes';
|
|
$field = $field ?? 'coupon_detail_addtimes';
|
|
@@ -326,6 +329,8 @@ class CouponDetailController extends Curd
|
|
}
|
|
}
|
|
if (!empty($couponDetailStatus)) {
|
|
if (!empty($couponDetailStatus)) {
|
|
$model = $model->where('coupon_detail_status', $couponDetailStatus);
|
|
$model = $model->where('coupon_detail_status', $couponDetailStatus);
|
|
|
|
+ } else {
|
|
|
|
+ $model = $model->where('coupon_detail_status', '<>', 'DISABLED');
|
|
}
|
|
}
|
|
if (!empty($memberId)) {
|
|
if (!empty($memberId)) {
|
|
$model = $model->where('join_coupon_detail_member_id', $memberId);
|
|
$model = $model->where('join_coupon_detail_member_id', $memberId);
|