|
@@ -403,22 +403,22 @@ class CouponController extends Curd
|
|
$val = $periodJson['val'] - 1;
|
|
$val = $periodJson['val'] - 1;
|
|
if ($val < 1) {
|
|
if ($val < 1) {
|
|
$params['coupon_detail_deadline_datetime'] = date('Y-m-d 23:59:59');
|
|
$params['coupon_detail_deadline_datetime'] = date('Y-m-d 23:59:59');
|
|
- }else{
|
|
|
|
- $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59',strtotime("+".$val." day"));
|
|
|
|
|
|
+ } else {
|
|
|
|
+ $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime("+" . $val . " day"));
|
|
}
|
|
}
|
|
} elseif ($periodJson['unit'] == 'week') {
|
|
} elseif ($periodJson['unit'] == 'week') {
|
|
$val = $periodJson['val'] - 1;
|
|
$val = $periodJson['val'] - 1;
|
|
- if ($val < 1){
|
|
|
|
|
|
+ if ($val < 1) {
|
|
$params['coupon_detail_deadline_datetime'] = date('Y-m-d 23:59:59', strtotime('this week Sunday'));
|
|
$params['coupon_detail_deadline_datetime'] = date('Y-m-d 23:59:59', strtotime('this week Sunday'));
|
|
- }else{
|
|
|
|
- $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59',strtotime("+".$val.' week',date('Y-m-d',strtotime("+".$val." month"))));
|
|
|
|
|
|
+ } else {
|
|
|
|
+ $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime("+" . $val . ' week', date('Y-m-d', strtotime("+" . $val . " month"))));
|
|
}
|
|
}
|
|
- } elseif ($periodJson['unit'] == 'month'){
|
|
|
|
|
|
+ } elseif ($periodJson['unit'] == 'month') {
|
|
$val = $periodJson['val'] - 1;
|
|
$val = $periodJson['val'] - 1;
|
|
- if ($val < 1){
|
|
|
|
|
|
+ if ($val < 1) {
|
|
$params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59');
|
|
$params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59');
|
|
- }else{
|
|
|
|
- $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59',strtotime("+".$val." month"));
|
|
|
|
|
|
+ } else {
|
|
|
|
+ $params['coupon_detail_deadline_datetime'] = date('Y-m-t 23:59:59', strtotime("+" . $val . " month"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -852,6 +852,24 @@ class CouponController extends Curd
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public function disableCoupon(Request $request)
|
|
|
|
+ {
|
|
|
|
+ $couponId = $request->post('coupon_id');
|
|
|
|
+ if (!$couponId){
|
|
|
|
+ return json_fail("参数异常");
|
|
|
|
+ }
|
|
|
|
+ Db::beginTransaction();
|
|
|
|
+ try {
|
|
|
|
+ Coupon::where('coupon_id',$couponId)->update(['coupon_status'=>'DISABLED']);
|
|
|
|
+ CouponDetail::where('join_detail_coupon_id',$couponId)->whereIn('coupon_detail_status',['INIT','PENDING'])->update(['coupon_detail_status'=>'DISABLED']);
|
|
|
|
+ Db::commit();
|
|
|
|
+ return json_success('success');
|
|
|
|
+ }catch (\Exception $e){
|
|
|
|
+ Db::rollBack();
|
|
|
|
+ return json_fail("禁用失败");
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
private function generateCouponDetail($couponId, $couponStatus, $nbr)
|
|
private function generateCouponDetail($couponId, $couponStatus, $nbr)
|
|
{
|
|
{
|
|
for ($i = 0; $i < intval($nbr); $i++) {
|
|
for ($i = 0; $i < intval($nbr); $i++) {
|