卡券加天数

app/admin/controller/coupon/CouponController.php

@@ -126,6 +126,11 @@ class CouponController extends Curd
                     $item['premises_range'] = 'all';
                 }
             }
+            if (!empty($item['coupon_validdate_begin']) && !empty($item['coupon_validdate_end'])){
+                $item['coupon_use_time'] = 'date';
+            }elseif ($item['coupon_validdate_day']){
+                $item['coupon_use_time'] = 'day';
+            }
         }
 
         return $items;
@@ -223,8 +228,14 @@ class CouponController extends Curd
         $params = $request->post();
         $data = $this->inputFilter($params);
         $data['coupon_id'] = "CU" . str_pad(SysSerial::getSerial(), 6, '0') . random_string(6, 'up');
-        $data['coupon_validdate_begin'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_begin']));
-        $data['coupon_validdate_end'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_end']));
+        if (!empty($params['coupon_use_time']) && $params['coupon_use_time'] == 'date'){
+            $data['coupon_validdate_day'] = null;
+            $data['coupon_validdate_begin'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_begin']));
+            $data['coupon_validdate_end'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_end']));
+        }elseif (!empty($params['coupon_use_time']) && $params['coupon_use_time'] == 'day'){
+            $data['coupon_validdate_begin'] = null;
+            $data['coupon_validdate_end'] = null;
+        }
         $couponJson = [];
         if ($params['coupon_use_member'] == 'member' && isset($params['member_list'])) {
             $couponJson['member']['list'] = $params['member_list'];
@@ -329,8 +340,14 @@ class CouponController extends Curd
         $primary_key = $this->model->getKeyName();
         $id = $request->post($primary_key);
         $data = $this->inputFilter($params);
-        $data['coupon_validdate_begin'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_begin']));
-        $data['coupon_validdate_end'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_end']));
+        if (!empty($params['coupon_use_time']) && $params['coupon_use_time'] == 'date'){
+            $data['coupon_validdate_day'] = null;
+            $data['coupon_validdate_begin'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_begin']));
+            $data['coupon_validdate_end'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_end']));
+        }elseif (!empty($params['coupon_use_time']) && $params['coupon_use_time'] == 'day'){
+            $data['coupon_validdate_begin'] = null;
+            $data['coupon_validdate_end'] = null;
+        }
         $model = $this->model->find($id);
         if (!$model) {
             throw new BusinessException('记录不存在', 2);

app/admin/validate/coupon/CouponValidate.php

@@ -15,8 +15,8 @@ class CouponValidate extends Validate
 //        'coupon_status|优惠券状态' => 'require|in:ACTIVED,DISABLED',
         'coupon_category|分类' => 'max:32',
         'coupon_name|名称' => 'require|max:32',
-        'coupon_validdate_begin|启用日期' => 'require',
-        'coupon_validdate_end|过期时间' => 'require',
+//        'coupon_validdate_begin|启用日期' => 'require',
+//        'coupon_validdate_end|过期时间' => 'require',
     ];
 
     /**
@@ -24,7 +24,7 @@ class CouponValidate extends Validate
      * @var array[]
      */
     protected $scene = [
-        'add' => ['coupon_category', 'coupon_name', 'coupon_validdate_begin', 'coupon_validdate_end'],
-        'update' => ['coupon_id', 'coupon_category', 'coupon_name', 'coupon_validdate_begin', 'coupon_validdate_end'],
+        'add' => ['coupon_category', 'coupon_name'],
+        'update' => ['coupon_id', 'coupon_category', 'coupon_name'],
     ];
 }