Merge branch 'master' of ssh://git.9026.com:2212/swdz-WangHaijun/BaoMa

app/Admin/Actions/backstage/Coupon/CouponBatchGrant.php

@@ -22,26 +22,51 @@ class CouponBatchGrant extends BatchAction
         {
             return $this->response()->error('优惠券数量不足')->refresh();
         }
-        $arr = [
-            'user_id' => 0,
-            'coupon_id'=>$coupon_id,
-            'name' => $coupon->name,
-            'title' => $coupon->title,
-            'desc' => $coupon->desc,
-            'rules' => $coupon->rules,
-            'icon' => $coupon->icon,
-            'type' => $coupon->type,
-            'usable_type' => $coupon->usable_type,
-            'money' => $coupon->money,
-            'discount' => $coupon->discount,
-            'min_consume_amount' => $coupon->min_consume_amount,
-            'max_reduce_amount' => $coupon->max_reduce_amount,
-            'expire_type' => $coupon->expire_type,
-            'effective_days' => $coupon->effective_days,
-            'start_time' => $coupon->start_time,
-            'end_time' => $coupon->end_time,
-            'coupons_num'=>0
-        ];
+        //获取过期类型是指定几天过期
+        if ($coupon->expire_type == 1){
+            $effective_days = $coupon->effective_days;
+            $expire_time = date("Y-m-d H:i:s", strtotime('+'.$effective_days.'day'));
+            $expire_time_num = strtotime($expire_time);
+            $arr = [
+                'user_id' => 0,
+                'coupon_id'=>$coupon_id,
+                'name' => $coupon->name,
+                'title' => $coupon->title,
+                'desc' => $coupon->desc,
+                'rules' => $coupon->rules,
+                'icon' => $coupon->icon,
+                'type' => $coupon->type,
+                'usable_type' => $coupon->usable_type,
+                'money' => $coupon->money,
+                'discount' => $coupon->discount,
+                'min_consume_amount' => $coupon->min_consume_amount,
+                'max_reduce_amount' => $coupon->max_reduce_amount,
+                'expire_type' => $coupon->expire_type,
+                'effective_days' => $coupon->effective_days,
+                'expire_time' => $expire_time_num,
+                'coupons_num'=>0
+            ];
+        }else{
+            $arr = [
+                'user_id' => 0,
+                'coupon_id'=>$coupon_id,
+                'name' => $coupon->name,
+                'title' => $coupon->title,
+                'desc' => $coupon->desc,
+                'rules' => $coupon->rules,
+                'icon' => $coupon->icon,
+                'type' => $coupon->type,
+                'usable_type' => $coupon->usable_type,
+                'money' => $coupon->money,
+                'discount' => $coupon->discount,
+                'min_consume_amount' => $coupon->min_consume_amount,
+                'max_reduce_amount' => $coupon->max_reduce_amount,
+                'expire_type' => $coupon->expire_type,
+                'start_time' => $coupon->start_time,
+                'end_time' => $coupon->end_time,
+                'coupons_num'=>0
+            ];
+        }
         foreach ($collection as $model) {
             $arr['user_id'] = $model->id;
             UserCoupon::insert($arr);

app/Admin/Controllers/CouponManagement/CouponManagementController.php

@@ -119,10 +119,24 @@ class CouponManagementController extends AdminController
         $form->select('position_type',__('发放平台'))->options([1=>'领券中心',2=>'后台发放']);
         $form->number('num', __('数量'));
         $form->select('usable_type',__('可用类型'))->options([1=>'全部产品通用',2=>'部分产品可用']);
-        $form->select('expire_type', __('过期类型'))->options([1=>'领取N天过期',2=>'设置固定过期时间']);
-        $form->text('effective_days', __('有效天数'));
-        $form->date('start_time', __('有效期开始时间'));
-        $form->date('end_time', __('有效期结束时间'));
+        $form->select('expire_type', '过期类型')
+            ->options([
+                1 => '领取N天过期',
+                2 => '设置固定过期时间',
+            ])->when(1, function (Form $form) {
+                $form->text('effective_days', __('有效天数'));
+            })->when(2, function (Form $form) {
+                $form->date('start_time', __('有效期开始时间'))->required();
+                $form->date('end_time', __('有效期结束时间'))->required()->rules(
+                    'date|after:start_time',['after' => '结束时间小于开始时间']
+                );
+                $form->saving(function ($form){
+                    $form->start_time = strtotime($form->start_time);
+                    $form->end_time = strtotime($form->end_time);
+                });
+
+
+            });
         return $form;
     }
 }