檢查優惠劵日期

app/adminapi/ApiController.php

@@ -56,16 +56,16 @@ abstract class ApiController
     protected function initialize()
     {
 
-        header('Access-Control-Allow-Origin: *');
+        // header('Access-Control-Allow-Origin: *');
     	
-        //允許的請求頭信息
+        // //允許的請求頭信息
-        header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization");
+        // header("Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization");
         
-        //允許的請求類型
+        // //允許的請求類型
-        header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE, OPTIONS, PATCH');
+        // header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE, OPTIONS, PATCH');
         
-        //允許攜帶證書式訪問（攜帶cookie）
+        // //允許攜帶證書式訪問（攜帶cookie）
-        header('Access-Control-Allow-Credentials:true');
+        // header('Access-Control-Allow-Credentials:true');
                 
     }
 

app/adminapi/controller/v1/Bonus.php

@@ -50,7 +50,13 @@ class Bonus extends ApiController
         $type_id = input('type_id');
         $bonus = Db::name('bonus_type')
             ->field('type_id,type_name,type_money,min_amount,send_type,send_start_date,send_end_date,use_start_date,use_end_date')
-            ->where('type_id', $type_id)->find();
+            ->where('type_id', $type_id)
+            ->find();
+
+        $bonus['send_start_date'] = $bonus['send_start_date']?date('Y-m-d', $bonus['send_start_date']):'';
+        $bonus['send_end_date'] = $bonus['send_end_date']?date('Y-m-d', $bonus['send_end_date']):'';
+        $bonus['use_start_date'] = $bonus['use_start_date']?date('Y-m-d', $bonus['use_start_date']):'';
+        $bonus['use_end_date'] = $bonus['use_end_date']?date('Y-m-d', $bonus['use_end_date']):'';
 
         return $this->Success($bonus);
     }
@@ -59,6 +65,7 @@ class Bonus extends ApiController
     {
         $data = input('post.');
         unset($data['act']);
+
         $data['send_start_date'] = isset($data['send_start_date']) ? strtotime($data['send_start_date']) : 0;
         $data['send_end_date'] = isset($data['send_end_date']) ? strtotime($data['send_end_date']) : 0;
         $data['use_start_date'] = isset($data['use_start_date']) ? strtotime($data['use_start_date']) : 0;
@@ -78,18 +85,19 @@ class Bonus extends ApiController
     {
         $data = input('post.');
         unset($data['act']);
-        $data['send_start_date'] = isset($data['send_start_date']) ? strtotime($data['send_start_date']) : 0;
+        $data['send_start_date'] = !empty($data['send_start_date']) ? strtotime($data['send_start_date']) : 0;
-        $data['send_end_date'] = isset($data['send_end_date']) ? strtotime($data['send_end_date']) : 0;
+        $data['send_end_date'] = !empty($data['send_end_date']) ? strtotime($data['send_end_date']) : 0;
-        $data['use_start_date'] = isset($data['use_start_date']) ? strtotime($data['use_start_date']) : 0;
+        $data['use_start_date'] = !empty($data['use_start_date']) ? strtotime($data['use_start_date']) : 0;
-        $data['use_end_date'] = isset($data['use_end_date']) ? strtotime($data['use_end_date']) : 0;
+        $data['use_end_date'] = !empty($data['use_end_date']) ? strtotime($data['use_end_date']) : 0;
 
-        $result = Db::name('bonus_type')
+        try{
+            Db::name('bonus_type')
             ->where('type_id', $data['type_id'])
             ->update($data);            
-
+        }catch(\Exception $e){
-        if (!$result) {
             return $this->Error('操作失败');
         }
+
         return $this->Success('操作成功');
     }
 

app/adminapi/route/app.php

@@ -6,4 +6,6 @@ use think\facade\Route;
 //     Route::rule(':version/user/:action', 'api/:version.user/:action');
 // })->middleware(\app\api\middleware\JWT::class);
 
-Route::rule(':version/:controller/:action','adminapi/:version.:controller/:action');
+Route::group(function () {
+    Route::rule(':version/:controller/:action', 'adminapi/:version.:controller/:action');
+});

app/appapi/controller/v1/Bonus.php

@@ -19,10 +19,19 @@ class Bonus extends ApiController
         if(!$result){
             return $this->Error('優惠券不存在');
         }
+        
         if($result['remain_number']==0){
             return $this->Error('優惠券已用完');        
         }
 
+        if($result['use_start_date']!=0 && $result['use_start_date']>time()){
+            return $this->Error('優惠券未開始使用');        
+        }
+
+        if($result['use_end_date']!=0 && $result['use_end_date']<time()){
+            return $this->Error('優惠券已過期');        
+        }
+
         $rtn = [
             'type_money' => $result['type_money'],
             'type_name' => $result['type_name'],

app/appapi/route/app.php

@@ -1,4 +1,5 @@
 <?php
+
 use think\facade\Route;
 
 Route::group(function () {
@@ -6,11 +7,11 @@ Route::group(function () {
 })->allowCrossDomain([
     'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept, Authorization, SessionId',
     'Access-Control-Expose-Headers' => 'Authorization, SessionId'
-    ])->middleware(\app\appapi\middleware\JWT::class);
+])->middleware(\app\appapi\middleware\JWT::class);
 
 Route::group(function () {
-    Route::rule(':version/:controller/:action','appapi/:version.:controller/:action');
+    Route::rule(':version/:controller/:action', 'appapi/:version.:controller/:action');
 })->allowCrossDomain([
     'Access-Control-Allow-Headers' => 'Origin, X-Requested-With, Content-Type, Accept, Authorization, SessionId',
     'Access-Control-Expose-Headers' => 'Authorization, SessionId'
-    ])->middleware(\app\appapi\middleware\CheckLogin::class);
+])->middleware(\app\appapi\middleware\CheckLogin::class);