Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

app/shop/database/sell_order.php

@@ -638,6 +638,7 @@ return array
             'default'   => '',
             'match'     => 'is_numeric',
             'desc'      => '',
+            'search'    => 'date',
             'list_name' =>'收货时间',
             'list'      => '"{fdate}" ? date("Y-m-d H:i", \'{fdate}\') : "-"',
             'list_order' => 8,

learn/active/database/code.php

@@ -149,7 +149,7 @@ return array
             'name'      => '座位号',
             'default'   => '',
             'desc'      => '座位号',
-            'match'     => 'is_string',
+            'match'     => 'option',
             'update'    => 'text',
             'search'    => 'fulltext',
             'list'      => true,

learn/active/lib/Order.php

@@ -38,13 +38,15 @@ Class Order
         $active = Dever::db('active/info')->find($active_id);
         if ($contents) {
             foreach ($contents as $k => $v) {
-                $user = Dever::db('active/user')->find(array('mobile'=>$v));
+                $user = Dever::db('active/user')->find(array('mobile'=>$v,'clear'=>true));
+                // print_R($user);die;
                 if ($user) {
                     $member = Dever::load('active/lib/user')->agent($user);
-                    $code = Dever::db('active/code')->getOne(array('active_id'=>$active_id,'join_uid'=>$user['id'],'status'=>'1,2'));
+                    $code = Dever::db('active/code')->getOne(array('active_id'=>$active_id,'join_uid'=>$user['id'],'status'=>'1,2','clear'=>true));
                     if ($code) {
                         Dever::alert('您已领取过了');
-                    }                 }
+                    }                
+                 }
             }
         }
     }
@@ -56,7 +58,7 @@ Class Order
         $active = Dever::db('active/info')->find($active_id);
         if ($contents) {
             foreach ($contents as $k => $v) {
-                $user = Dever::db('active/user')->find(array('mobile'=>$v));
+                $user = Dever::db('active/user')->find(array('mobile'=>$v,'clear'=>true));
                 if ($user) {
                     $member = Dever::load('active/lib/user')->agent($user);
                     if ($member && $active['status'] == 2) {

learn/active/src/Off.php

@@ -62,9 +62,14 @@ Class Off extends Coreoff
 			$res['info']['active_name'] = $active['name'];
 			$res['info']['name'] = $user['name'];
 			$res['info']['mobile'] = $user['mobile'];
-			$parent_user = Dever::db('active/user')->find($data['buy_uid']);
-			$res['info']['parent_name'] = $parent_user['name'];
-			$res['info']['parent_mobile'] = $parent_user['mobile'];
+			$res['info']['parent_name'] = '';
+			$res['info']['parent_mobile'] = '';
+			if ($data['buy_uid'] && $data['buy_uid'] >0) {
+				$parent_user = Dever::db('active/user')->find($data['buy_uid']);
+				$res['info']['parent_name'] = $parent_user['name'];
+				$res['info']['parent_mobile'] = $parent_user['mobile'];
+			}
+			
 			$res['info']['role_name'] = '';
 			$res['info']['title_name'] = '';
 			$member = Dever::load('active/lib/user')->agent($user);

service/agent/lib/Order.php

@@ -1413,11 +1413,13 @@ class Order
             $t = 1;
         }
 
+        $s = $t;
+
         $goods = Dever::db('agent/order_goods')->getData(array('order_id' => $info['id']));
         if (!$goods) {
             $goods = Dever::db('setting/role_goods')->getData(array('role_id' => $info['role'], 'give' => $info['order_type']));
         } else {
-            $t = 1;
+            $s = 1;
         }
         $process_button = array();
         if (isset($process[3]['type']) && is_array($process[3]['type']) && in_array(2, $process[3]['type'])) {
@@ -1457,6 +1459,7 @@ class Order
                     $v['num'] = $v['num'] * $t;
                     $table['body'][] = array('商品', $goods_info['name'] . $sku, $goods_info['price'], $v['num']);
                 } elseif ($v['type'] == 2) {
+                    $t = $s;
                     $card = Dever::db('card/info')->find($v['type_id']);
                     if ($card) {
                         if ($card['create_type'] == 3) {

service/agent/lib/Soft_cash.php

@@ -348,11 +348,22 @@ Class Soft_cash
         if ($value) {
             $data = Dever::db('agent/member')->one(array('mobile' => $value,'state' =>1));
             $table = array();
+            $table['body'] = array();
             if ($data) {
-                $table = array();
-                $table['head'] = array('序列号', '姓名', '手机号');
-                $table['body'] = array();
-                $table['body'] = array($data['id'], $data['name'], $data['mobile']);
+                $info = Dever::db('agent/soft_cash')->find(array('mobile'=>$value));
+                if ($info) {
+                    $info['buy_date'] = '<p style="color:red">'.date('Y-m-d H:i',$info['buy_date']).'</p>';
+                    $table['head'] = array('序列号', '姓名', '手机号','上次购买时间');
+                    $table['body'] = array($data['id'], $data['name'], $data['mobile'],$info['buy_date']);
+                } else {
+                    $table['head'] = array('序列号', '姓名', '手机号');
+                    $table['body'] = array($data['id'], $data['name'], $data['mobile']);
+                }
+                
+                
+                // $table['head'] = array('序列号', '姓名', '手机号','上次购买时间');
+                
+                // $table['body'] = array($data['id'], $data['name'], $data['mobile']);
                 // foreach ($data as $k => $v) {
                 //     $member = Dever::db('agent/member')->find($v['mid']);
                 //     $table['body'][] = array($k+1, $member['name'], $v['mobile']);

tool/work/database/info_stat.php

@@ -158,13 +158,13 @@ return array
         ),
         'data' => array
         (
-        	array('工单总量', function() {return Dever::db('work/info')->total();}),
-        	array('今日新增', function() {list($start, $end) = Dever::day(); return Dever::db('work/info')->total(array('start' => $start, 'end' => $end));}),
-        	array('本月新增', function() {list($start, $end) = Dever::month();return Dever::db('work/info')->total(array('start' => $start, 'end' => $end));}),
-        	array('待处理', function() {return Dever::db('work/info')->total(array('status'=>1));}),
-        	array('处理中', function() {return Dever::db('work/info')->total(array('status' => 2));}),
-        	array('完成关闭', function() {return Dever::db('work/info')->total(array('status' => 3));}),
-        	array('取消关闭', function() {return Dever::db('work/info')->total(array('status' => 4));}),
+        	array('工单总量', function() {return Dever::db('work/info')->total(array('state'=>1));}),
+        	array('今日新增', function() {list($start, $end) = Dever::day(); return Dever::db('work/info')->total(array('start' => $start, 'end' => $end, 'state'=>1));}),
+        	array('本月新增', function() {list($start, $end) = Dever::month();return Dever::db('work/info')->total(array('start' => $start, 'end' => $end, 'state'=>1));}),
+        	array('待处理', function() {return Dever::db('work/info')->total(array('status'=>1, 'state'=>1));}),
+        	array('处理中', function() {return Dever::db('work/info')->total(array('status' => 2,'state'=>1));}),
+        	array('完成关闭', function() {return Dever::db('work/info')->total(array('status' => 3, 'state'=>1));}),
+        	array('取消关闭', function() {return Dever::db('work/info')->total(array('status' => 4,'state'=>1));}),
         ),
     ),