Browse Source

完善功能

gorden 10 months ago
parent
commit
31fdb55077
1 changed files with 11 additions and 7 deletions
  1. 11 7
      app/admin/controller/coupon/CouponController.php

+ 11 - 7
app/admin/controller/coupon/CouponController.php

@@ -42,8 +42,12 @@ class CouponController extends Curd
     public function afterQuery($items)
     {
         foreach ($items as &$item) {
-            $item->coupon_begindate = date('Y-m-d H:i:s', $item->coupon_begindate);
-            $item->coupon_enddate = date('Y-m-d H:i:s', $item->coupon_enddate);
+            if (!empty($item->coupon_begindate)) {
+                $item->coupon_begindate = date('Y-m-d H:i:s', $item->coupon_begindate);
+            }
+            if (!empty($item->coupon_enddate)) {
+                $item->coupon_enddate = date('Y-m-d H:i:s', $item->coupon_enddate);
+            }
         }
 
         return $items;
@@ -52,9 +56,9 @@ class CouponController extends Curd
     protected function insertInput(Request $request): array
     {
         $data = $this->inputFilter($request->post());
-        $data['coupon_id'] = "CO".str_pad(SysSerial::getSerial(), 16, '0') . random_string(8,'up');
-        $data['coupon_begindate'] = date("Y-m-d H:i:s",strtotime($data['coupon_begindate']));
-        $data['coupon_enddate'] = date("Y-m-d H:i:s",strtotime($data['coupon_enddate']));
+        $data['coupon_id'] = "CO" . str_pad(SysSerial::getSerial(), 16, '0') . random_string(8, 'up');
+        $data['coupon_begindate'] = date("Y-m-d H:i:s", strtotime($data['coupon_begindate']));
+        $data['coupon_enddate'] = date("Y-m-d H:i:s", strtotime($data['coupon_enddate']));
 
         return $data;
     }
@@ -64,8 +68,8 @@ class CouponController extends Curd
         $primary_key = $this->model->getKeyName();
         $id = $request->post($primary_key);
         $data = $this->inputFilter($request->post());
-        $data['coupon_begindate'] = date("Y-m-d H:i:s",strtotime($data['coupon_begindate']));
-        $data['coupon_enddate'] = date("Y-m-d H:i:s",strtotime($data['coupon_enddate']));
+        $data['coupon_begindate'] = date("Y-m-d H:i:s", strtotime($data['coupon_begindate']));
+        $data['coupon_enddate'] = date("Y-m-d H:i:s", strtotime($data['coupon_enddate']));
         $model = $this->model->find($id);
         if (!$model) {
             throw new BusinessException('记录不存在', 2);