|
|
@@ -49,6 +49,9 @@ class CouponController extends Curd
|
|
|
$where['coupon_addtimes'][0] = strtotime($where['coupon_addtimes'][0]);
|
|
|
$where['coupon_addtimes'][1] = strtotime($where['coupon_addtimes'][1]);
|
|
|
}
|
|
|
+ if (!empty($where['coupon_id'])) {
|
|
|
+ $where['coupon_id'] = ['like', trim($where['coupon_id'])];
|
|
|
+ }
|
|
|
$order = $request->get('order', 'desc');
|
|
|
$field = $field ?? 'coupon_addtimes';
|
|
|
$query = $this->doSelect($where, $field, $order);
|
|
|
@@ -358,7 +361,7 @@ class CouponController extends Curd
|
|
|
$couponJson['premises_range'] = '部分门店可用';
|
|
|
}
|
|
|
|
|
|
- if (in_array($data['coupon_classify'],['抵用券','立减券','赠品券','福利券','年卡','季卡','月卡'])) {
|
|
|
+ if (in_array($data['coupon_classify'], ['抵用券', '立减券', '赠品券', '福利券', '年卡', '季卡', '月卡'])) {
|
|
|
$data['coupon_minimum_limit'] = 0;
|
|
|
}
|
|
|
|
|
|
@@ -736,6 +739,9 @@ class CouponController extends Curd
|
|
|
'nbr' => $params['period_nbr']
|
|
|
]);
|
|
|
}
|
|
|
+ if (in_array($data['coupon_classify'], ['抵用券', '立减券', '赠品券', '福利券', '年卡', '季卡', '月卡'])) {
|
|
|
+ $data['coupon_minimum_limit'] = 0;
|
|
|
+ }
|
|
|
|
|
|
unset($data[$primary_key]);
|
|
|
return [$id, $data];
|
gorden