edit

src/dai/channel/lib/Manage.php

@@ -8,7 +8,17 @@ class Manage extends Auth
     {
         return Dever::db('info', 'channel')->select(array('status' => 1));
     }
-
+    public function formatTime($timevalue)
+    {
+        if(strpos($timevalue,"-"))
+        {
+            return strtotime($timevalue);
+        }
+        else
+        {
+            return intval(($timevalue- 25569) * 3600 * 24) - 8*3600 + 60;
+        }
+    }
     # 上传卡密
     public function uploadCard($data)
     {
@@ -27,6 +37,11 @@ class Manage extends Auth
                         }
                         $update['pwd'] = $v['B'];
                         $value = $v['C'];
+                        $end = $v['D'];
+                        if (!strstr($end, '-')) {
+                            $end = $this->formatTime($end);
+                            $end = date('Y-m-d', $end);
+                        }
                         $sku = Dever::db('info_sku', 'goods')->find(array('info_id' => $goods[1], 'value' => $value));
                         if (!$sku) {
                             continue;
@@ -36,6 +51,7 @@ class Manage extends Auth
                         $update['sku_id'] = $sku['id'];
                         $update['channel_id'] = $data['channel_id'];
                         $update['goods'] = $data['goods'];
+                        $update['end'] = $end;
                         Dever::db('card', 'channel')->insert($update);
                     }
                 }

src/dai/channel/table/card.php

@@ -53,6 +53,12 @@ return array
             'type'      => 'int(11)',
         ),
 
+        'end' => array
+        (
+            'name'      => '有效期',
+            'type'      => 'varchar(200)',
+        ),
+
         'status' => array
         (
             'name'      => '状态',

src/dai/channel/table/manage/card.php

@@ -3,6 +3,11 @@ $channel_id = Dever::input('set')['channel_id'] ?? 0;
 if (!$channel_id) {
     $channel_id = Dever::input('field')['channel_id'] ?? 0;
 }
+$id = Dever::input('id');
+$type = 'text';
+if ($id > 0) {
+    $type = 'show';
+}
 return array
 (
     'list' => array
@@ -37,7 +42,7 @@ return array
         ),
         'data_button' => array
         (
-            '编辑' => array('fastedit', 'number,pwd'),
+            '查看' => array('fastedit', 'number,pwd,end'),
         ),
         'button' => array
         (
@@ -119,13 +124,19 @@ return array
             ),
             'number' => array
             (
+                'type' => $type,
                 'rules' => true,
                 'default' => '"{number} "',
             ),
             'pwd' => array
             (
+                'type' => $type,
                 'rules' => true,
             ),
+            'end' => array
+            (
+                'type' => $type,
+            ),
         ),
     ),
 );

src/dai/seller/lib/Manage.php

@@ -543,7 +543,7 @@ class Manage extends Auth
     public function outKm($data)
     {
         $result = array();
-        $result['head'] = array('订单id', '订单号', '商品', '面值', '卡号', '密码', '导出时间');
+        $result['head'] = array('订单id', '订单号', '商品', '面值', '卡号', '密码', '有效期');
         $result['body'] = array();
         foreach ($data['body'] as $k => $v) {
             //$v['sku_id']
@@ -551,7 +551,7 @@ class Manage extends Auth
             $card = Dever::db('card', 'channel')->select(array('order_id' => $v['id'], 'status' => 1));
             if ($card) {
                 foreach ($card as $k1 => $v1) {
-                    $result['body'][] = array($v['id'], $v['order_num'], $goods_name, $v['cash'], $v1['number'], $v1['pwd'], date('Y-m-d H:i:s'));
+                    $result['body'][] = array($v['id'], $v['order_num'], $goods_name, $v['cash'], $v1['number'], $v1['pwd'], $v1['end']);
                 }
             }
         }