edit

tool/stats/lib/Manage.php

@@ -496,10 +496,14 @@ Class Manage
 		if ($data) {
 			foreach ($data as $k =>$v) {
 				$cdata = '';
+				$leixing = '';
 				if ($v['cdate']) {
 					$cdate = date('Y-m-d H:i',$v['cdate']);
 				}
-				$type = '发放权益';
+				if ($where['types'] == 1 || $where['types'] == -1) {
+					$leixing = '发放权益';
+				}
+				
 				$role_name = '';
 				$member_name = '';
 				$member_mobile = '';
@@ -534,110 +538,89 @@ Class Manage
 	                $desc = $member_goods_log['desc'];
 	            }
 	            $dh_order_ps = Dever::db('agent/dh_order_ps')->getDui($v['mid']);
-	            if ($dh_order_ps) {
-	            	$type = '兑换权益';
-	            	foreach ($dh_order_ps as $k =>$v) {
-	            		$dh_order = Deverr::db('agent/dh_order_ps')->find($v['order_id']);
-	            		if ($dh_order && isset($dh_order['info']) && $dh_order['info']){
-	            			$desc = $dh_order['info'];
-	            		}
-	            	}
-	            }
-	            if ($where['types'] == 2) {
-	            	if (!$dh_order_ps) {
-	            		$file = '代理商权益明细';
-        				return Dever::excelExport($body, $header, $file);
-	            	}
+	            if ($where['types'] == 2 || $where['types'] == -1) {
+	            	if ($dh_order_ps) {
+		            	$leixing = '兑换权益';
+		            	foreach ($dh_order_ps as $k =>$v) {
+		            		$dh_order = Deverr::db('agent/dh_order_ps')->find($v['order_id']);
+		            		if ($dh_order && isset($dh_order['info']) && $dh_order['info']){
+		            			$desc = $dh_order['info'];
+		            		}
+		            	}
+		            } 
 	            }
 	            
+	           //  if ($where['types'] == 2) {
+	           //  	if (!$dh_order_ps) {
+	           //  		$file = '代理商权益明细';
+        				// return Dever::excelExport($body, $header, $file);
+	           //  	}
+	           //  }
 	           
 	            $shop_name = '';
 	            $shop_type = '';
 	            $shop_sid = '';
 	            $order_num = '';
 	            if (isset($where['shop_id']) && $where['shop_id']) {
-	            	// print_R($where['shop_id']);die;
 	            	$where['types'] = 3;
 	            	$sell_order = Dever::db('shop/sell_order')->find(array('shop_id'=>$where['shop_id']));
 	            	if ($sell_order) {
-	            		$w = $this->common($sell_order);
-	            		$type = '使用权益';
-	            		if ($w) {
-	            			$shop_name = $w['shop_name'];
-					        $shop_type = $w['shop_type'];
-					        $shop_sid = $w['shop_sid'];
-					        $order_num = $w['order_num'];
-	            			$d = array
-				                (
-				                	$cdate,
-				                	$v['name'],
-				                	$role_name,
-				                	$member_name,
-				                	$member_mobile,
-				                	$card,
-				                	$type,
-				                	$v['total_num'],
-				                	$v['price'],
-						            $v['cash'],
-						            $shop_type,
-						            $shop_sid,
-						            $shop_name,
-						            $order_num,
-						            $desc,
-					            	'',
-					            	date('Y-m-d H:i',$v['cdate']),
-					                $member_cdate,
-					                $youxiao,
-				                );
-				               	$body[] = $d;
+	            		if ($where['types'] == 3 || $where['types'] == -1){
+	            			$w = $this->common($sell_order);
+		            		$leixing = '使用权益';
+		            		if ($w) {
+		            			$shop_name = $w['shop_name'];
+						        $shop_type = $w['shop_type'];
+						        $shop_sid = $w['shop_sid'];
+						        $order_num = $w['order_num'];
+		            			
+		            		}
 	            		}
-	            		$file = '代理商权益明细';
-	            		 return Dever::excelExport($body, $header, $file);
+	            		
 	            	}
 	            	
 	            } else {
 	            	$sell_order = Dever::db('shop/sell_order')->find(array('card_code_id'=>$v['sku_id']));
+	            	if ($sell_order) {
+	            		if ($where['types'] == 3 || $where['types'] == -1) {
+	            			$leixing = '使用权益';
+		                	$w = $this->common($sell_order);
+		                	if ($w) {
+		                		$shop_name = $w['shop_name'];
+						        $shop_type = $w['shop_type'];
+						        $shop_sid = $w['shop_sid'];
+						        $order_num = $w['order_num'];
+		                	}
+	            		}
+	                }
 	            }
-                
-                if ($where['types'] == 3) {
-                	if (!$sell_order) {
-                		$file = '代理商权益明细';
-        				return Dever::excelExport($body, $header, $file);
-                	} 
-                } 
-                if ($sell_order) {
-                	$type = '使用权益';
-                	$w = $this->common($sell_order);
-                	if ($w) {
-                		$shop_name = $w['shop_name'];
-				        $shop_type = $w['shop_type'];
-				        $shop_sid = $w['shop_sid'];
-				        $order_num = $w['order_num'];
-                	}
+	            
+                if ($leixing) {
+                	$d = array
+	                (
+	                	$cdate,
+	                	$v['name'],
+	                	$role_name,
+	                	$member_name,
+	                	$member_mobile,
+	                	$card,
+	                	$leixing,
+	                	$v['total_num'],
+	                	$v['price'],
+			            $v['cash'],
+			            $shop_type,
+			            $shop_sid,
+			            $shop_name,
+			            $order_num,
+			            $desc,
+		            	'',
+		            	date('Y-m-d H:i',$v['cdate']),
+		                $member_cdate,
+		                $youxiao,
+	                );
+	               	$body[] = $d;
                 }
-                $d = array
-                (
-                	$cdate,
-                	$v['name'],
-                	$role_name,
-                	$member_name,
-                	$member_mobile,
-                	$card,
-                	$type,
-                	$v['total_num'],
-                	$v['price'],
-		            $v['cash'],
-		            $shop_type,
-		            $shop_sid,
-		            $shop_name,
-		            $order_num,
-		            $desc,
-	            	'',
-	            	date('Y-m-d H:i',$v['cdate']),
-	                $member_cdate,
-	                $youxiao,
-                );
-               	$body[] = $d;
+                
 			}
 			
 		}

tool/work/lib/Appoint.php

@@ -389,11 +389,14 @@ Class Appoint
             }
 			if (isset($admin[1]) && $admin[1]) {
                 $adm = Dever::db('manage/admin')->find($admin[1]);
+                if ($adm) {
+                    $adm_username = $adm['username'];
+                }
             } else {
-                $adm = array();
+                $adm_username = '';
             }
         	if ($group && $admin) {
-                $data['zhi'][$k]['admin'] = $group['name'].'   /   '.$adm['username'];
+                $data['zhi'][$k]['admin'] = $group['name'].'   /   '.$adm_username;
             } else {
                 $data['zhi'][$k]['admin'] = '';
             }

tool/work/lib/Cron.php

@@ -12,6 +12,7 @@ Class Cron
         	$group_id = explode(',',$v['group']);
         	$admin = Dever::db('manage/admin')->find($group_id[1]);
             $content = $this->email_api($v,$admin);
+            // print_R($content);
             $this->send($admin['email'], $admin['username'], $title, $content); 
         }
     }
@@ -22,7 +23,7 @@ Class Cron
         $end = $start+86400-1;
         $config = Dever::db('work/info')->config['config_status'];
         $data['branch'] = $v;
-        $question = Dever::db('work/question')->state(array('branch_id'=>$data['branch']['group_id']));
+        $question = Dever::db('work/question')->state(array('branch_id'=>$data['branch']['id']));
         $question = array_keys($question);
         $data['info']['app'] = Dever::db('work/info')->getCount(array('question'=>$question,'end'=>$end));
         $data['info']['xu'] = Dever::db('work/info')->getCount(array('group'=>$data['branch']['group_id'],'end'=>$end,'status'=>2));
@@ -41,9 +42,7 @@ Class Cron
 
         $data['question'] = Dever::db('work/question')->getAll(array('branch_id'=>$data['branch']['group_id']));
         $question = implode(',',$question);
-        // print_R($question);die;
         $data['app'] = Dever::db('work/info')->fetchAll('select * from churen_work_info where (`group` in ('.$data['branch']['group_id'].') or fpeople in ('.$people.') or question in ('.$question.')) and cdate <='.$end.' and state = 1');
-       
         foreach ($data['app'] as $k1 => $v1) {
             $data['app'][$k1]['cdate'] = date('Y-m-d H:i:s',$v1['cdate']);
             $data['app'][$k1]['zhipai'] = date('Y-m-d H:i:s',$v1['zdate']);