Your Name il y a 3 ans
Parent
commit
9e996e1a29
2 fichiers modifiés avec 8 ajouts et 3 suppressions
  1. 6 2
      app/card/lib/Manage.php
  2. 2 1
      learn/active/src/User.php

+ 6 - 2
app/card/lib/Manage.php

@@ -187,7 +187,7 @@ class Manage
 
 
     public function outCode($data)
     public function outCode($data)
     {
     {
-        $header = array('礼品卡名称', '卡号', '总面值', '已用面值', '剩余面值', '使用状态', '兑换时间');
+        $header = array('礼品卡名称', '卡号', '总面值', '已用面值', '剩余面值', '使用状态', '兑换时间' ,'绑定时间');
         $body = array();
         $body = array();
         
         
         $config = Dever::db('card/code')->config;
         $config = Dever::db('card/code')->config;
@@ -198,6 +198,10 @@ class Manage
             if ($v['ddate']) {
             if ($v['ddate']) {
                 $date = date('Y-m-d H:i', $v['ddate']);
                 $date = date('Y-m-d H:i', $v['ddate']);
             }
             }
+            $bdate = '';
+            if ($v['bdate']) {
+                $bdate = date('Y-m-d H:i',$v['bdate']);
+            }
             $status = $config['status'][$v['status']];
             $status = $config['status'][$v['status']];
             $d = array
             $d = array
             (
             (
@@ -208,7 +212,7 @@ class Manage
                 round($v['total_cash'] - $v['use_cash'], 2),
                 round($v['total_cash'] - $v['use_cash'], 2),
                 $status,
                 $status,
                 $date,
                 $date,
-
+                $bdate,
             );
             );
 
 
             $body[] = $d;
             $body[] = $d;

+ 2 - 1
learn/active/src/User.php

@@ -128,6 +128,7 @@ Class User extends Core
 			$data['list'][$k]['status_name'] = Dever::status($config,$v['status']);
 			$data['list'][$k]['status_name'] = Dever::status($config,$v['status']);
 			$data['list'][$k]['total_price'] = $v['num'] * $v['price'];
 			$data['list'][$k]['total_price'] = $v['num'] * $v['price'];
 			$data['list'][$k]['pay_time'] = '';
 			$data['list'][$k]['pay_time'] = '';
+            $data['list'][$k]['mobile'] = $active['mobile'];
 		}
 		}
 		return $data;
 		return $data;
 	}
 	}
@@ -161,7 +162,7 @@ Class User extends Core
 			$data['info']['mobile'] = $active['mobile'];
 			$data['info']['mobile'] = $active['mobile'];
 			#使用核销码
 			#使用核销码
 			$code = Dever::db('active/code')->getCode(array('order_id'=>$id,'status'=>'1,2'));
 			$code = Dever::db('active/code')->getCode(array('order_id'=>$id,'status'=>'1,2'));
-            if (!$$data['refund_num']){
+            if (!$data['refund_num']){
                 $data['refund_num'] = 0;
                 $data['refund_num'] = 0;
             }
             }
 			$no_code = $data['info']['num']-count($code)-$data['refund_num'];
 			$no_code = $data['info']['num']-count($code)-$data['refund_num'];