日期格式化

@@ -93,6 +93,9 @@ class Card extends Common
         }
         }
         $rs[0]['start_time'] =  date("Y年m月d日",$rs[0]['start_time']);
         $rs[0]['start_time'] =  date("Y年m月d日",$rs[0]['start_time']);
         $rs[0]['end_time']   =  date("Y年m月d日",$rs[0]['end_time']);
         $rs[0]['end_time']   =  date("Y年m月d日",$rs[0]['end_time']);
+
+        $rs[0]['receive_start_time'] =  date("Y年m月d日",$rs[0]['receive_start_time']);
+        $rs[0]['receive_end_time']   =  date("Y年m月d日",$rs[0]['receive_end_time']);
         $this->assign ('rs',$rs[0]);
         $this->assign ('rs',$rs[0]);
         $this->assign ( 'title','优惠券详情');
         $this->assign ( 'title','优惠券详情');
         return $this->fetch();
         return $this->fetch();
@@ -228,6 +231,7 @@ class Card extends Common
             //格式化数据
             //格式化数据
             foreach ($rs as $key => $value) {
             foreach ($rs as $key => $value) {
                 $rs[$key]['create_time'] = date("Y年m月d日",$value['create_time']);
                 $rs[$key]['create_time'] = date("Y年m月d日",$value['create_time']);
+                $rs[$key]['contributor_time'] = date("Y年m月d日",$value['create_time']);
                 switch ($value['status']) {
                 switch ($value['status']) {
                     case '1':
                     case '1':
                         $rs[$key]['status_msg'] = '已投放';
                         $rs[$key]['status_msg'] = '已投放';
@@ -341,4 +345,61 @@ class Card extends Common
         $this->assign ( 'title','卡券投放');
         $this->assign ( 'title','卡券投放');
         return $this->fetch();
         return $this->fetch();
     }
     }
+
+    /**
+     * 商家卡券-优惠券-卡券列表
+     */
+    public function sellercardsss(){
+        if(Request::isAjax()){
+            $data = Request::except('file');
+
+            $where = '';
+            $channel = $data['channel'] ? $data['channel'] : 1;
+
+            $where .= ($channel && $channel==4) ? ' re.type_id in (1,2,3)' : " re.type_id in ($channel)";
+            $where .= $data['key'] ? ' and s.sellername like "%'.$data['key'].'%"' : "";
+            
+            $offset = ($data["page"] - 1) * $data["limit"];
+            $limit  = " LIMIT $offset,".$data['limit'];
+
+            //卡券信息
+            $rs = Db::query("SELECT
+                                s.*
+                            FROM
+                                `xt-member-two-LINE`.xt_dc_dz_card_info AS s
+                                LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id
+                            WHERE
+                            ".$where." order by s.sid".$limit);
+            //格式化数据
+            foreach ($rs as $key => $value) {
+                $rs[$key]['create_time'] = date("Y年m月d日",$value['create_time']);
+                switch ($value['status']) {
+                    case '1':
+                        $rs[$key]['status'] = '已投放';
+                        break;
+                    case '2':
+                        $rs[$key]['status'] = '未投放';
+                        break;
+                    case '3':
+                        $rs[$key]['status'] = '停止投放';
+                        break;
+                    default:
+                        # code...
+                        break;
+                }
+            }
+
+            //获取总条数
+            $total = Db::query("SELECT
+                            s.id 
+                        FROM
+                            `xt-member-two-LINE`.xt_dc_dz_card_info AS s
+                            LEFT JOIN `xt-member-two-LINE`.xt_dc_dz_seller_type_rel AS re ON re.sid = s.id
+                        WHERE
+                            ".$where."");
+            return $result = ['code'=>0,'msg'=>'获取成功!','data'=>$rs,'count'=>count($total),'rel'=>1];
+        }
+        $this->assign ( 'title','商家卡券');
+        return $this->fetch();
+    }
 }
 }