|
@@ -74,7 +74,14 @@ class CouponDetailController extends Curd
|
|
->where('coupon_classify', $request->get('coupon_classify'));
|
|
->where('coupon_classify', $request->get('coupon_classify'));
|
|
}
|
|
}
|
|
if (!empty($request->get('get_type'))) {
|
|
if (!empty($request->get('get_type'))) {
|
|
- $model = $model->whereJsonContains("coupon_detail_extend_json->gettype", $request->get('get_type'));
|
|
|
|
|
|
+ if ($request->get('get_type') == 'SEND') {
|
|
|
|
+ $model = $model->where(function ($query2) {
|
|
|
|
+ $query2->whereJsonContains("coupon_detail_extend_json->gettype", 'SEND')
|
|
|
|
+ ->orWhereJsonContains("coupon_detail_extend_json->gettype", 'SYSTEM');
|
|
|
|
+ });
|
|
|
|
+ } else {
|
|
|
|
+ $model = $model->whereJsonContains("coupon_detail_extend_json->gettype", $request->get('get_type'));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
foreach ($where as $column => $value) {
|
|
foreach ($where as $column => $value) {
|
|
if (is_array($value)) {
|
|
if (is_array($value)) {
|