Your Name hace 2 años
padre
commit
e3da128595
Se han modificado 3 ficheros con 134 adiciones y 104 borrados
  1. 13 0
      app/shop/database/sign.php
  2. 1 0
      app/shop/lib/Sign.php
  3. 120 104
      tool/stats/lib/Manage.php

+ 13 - 0
app/shop/database/sign.php

@@ -224,6 +224,19 @@ return array
             'tab'       => 0,
         ),
 
+        'screen_pic'     => array
+        (
+            'type'      => 'varchar-150',
+            'name'      => '商户网站/APP截图',
+            'default'   => '',
+            'desc'      => '商户网站/APP截图',
+            'match'     => 'option',
+            'update'    => 'image',
+            'key'       => '8',
+            'place'     => '660*660',
+            'tab'       => 0,
+        ),
+
         'name'      => array
         (
             'type'      => 'varchar-32',

+ 1 - 0
app/shop/lib/Sign.php

@@ -29,6 +29,7 @@ Class Sign {
 		'bank_fount' => ['document_type' => '0025','document_name' => '银行卡正面照'],
 		'bank_back' => ['document_type' => '0026','document_name' => '银行卡反面照'],
 		'house_pic' => ['document_type' => '0015','document_name' => '室内照片'],
+		'screen_pic' => ['document_type' => '0034','document_name' => '商户网站/APP截图'],
 	);
 
 	# 计划任务

+ 120 - 104
tool/stats/lib/Manage.php

@@ -338,6 +338,9 @@ Class Manage
 			}
 			
 		}
+		if (!$body) {
+			Dever::alert('此时段没有数据,请重新选择条件');
+		}
 		$file = '商品销售相关数据';
     	return Dever::excelExport($body, $header, $file);
 	}
@@ -395,9 +398,7 @@ Class Manage
 		if ($where) {
 			$where = implode(' and ', $where);
 			$data = Dever::db('agent/member_goods')->fetchAll("select t_1.*,t_2.id as aid from churen_agent_member_goods as t_1 left join churen_agent_member as t_2 on t_1.mid = t_2.id where " . $where,array(),array(20, 'list'));
-			// $data = Dever::db('agent/member_goods')->getJoinAll($where);
-			// echo Dever::sql();
-			// print_R($data);die;
+			
 			if ($data) {
 				foreach ($data as $k => $v) {
 					$role_name = '';
@@ -466,6 +467,9 @@ Class Manage
 				
 			} 
 		}
+		if (!$body) {
+			Dever::alert('此时段没有数据,请重新选择条件');
+		}
 		$file = '代理商权益';
         return Dever::excelExport($body, $header, $file);
 	}
@@ -521,81 +525,99 @@ Class Manage
 		$body = array();
 		$where['type'] = '1,2';
 		$data = Dever::db('agent/member_goods')->getMingxi($where);
-		if ($data) {
-			foreach ($data as $k =>$v) {
-				$cdata = '';
-				$leixing = '';
-				$member_goods_name = '';
-				if (isset($v['name']) && $v['name']) {
-					$member_goods_name = $v['name'];
-				}
-				if ($v['cdate']) {
-					$cdate = date('Y-m-d H:i',$v['cdate']);
-				}
-				$total_num = '';
-				if(isset($v['total_num']) && $v['total_num']) {
-					$total_num = $v['total_num'];
-				}
-				$price = '';
-				if (isset($v['price']) && $v['price']) {
-					$price = $v['price'];
-				}
-	            $cash = '';
-	            if (isset($v['cash']) && $v['cash']) {
-	            	$cash = $v['cash'];
-	            }
-			            
-				if ($where['types'] == 1 || $where['types'] == -1) {
-					$leixing = '发放权益';
+		$res = array('发放权益','兑换权益','使用权益');
+		// print_R($data);die;
+		$rest = array();
+		if ($where['types'] == -1) {
+			foreach ($res as $a => $b ){
+				foreach ($data as $k => $v) {
+					$v['leixing'] = $b;
+					$rest[] = $v;
 				}
-				
-				$role_name = '';
-				$member_name = '';
-				$member_mobile = '';
-				$member_cdate = '-';
-				$member = Dever::db('agent/member')->find($v['mid']);
-				if ($member) {
-		            if($member['cdate']){
-		                $member_cdate = date('Y-m-d H:i',$member['cdate']);
+			}
+		} elseif ($where['types'] == 1) {
+			foreach ($data as $k => $v) {
+				$v['leixing'] = '发放权益';
+				$rest[] = $v;
+			}
+		} elseif ($where['types'] == 2) {
+			foreach ($data as $k => $v) {
+				$v['leixing'] = '兑换权益';
+				$rest[] = $v;
+			}
+		} elseif ($where['types'] == 3) {
+			foreach ($data as $k => $v) {
+				$v['leixing'] = '使用权益';
+				$rest[] = $v;
+			}
+		}
+		
+		foreach ($rest as $k => $v) {
+			$data[$k]['cdate'] = date('Y-m-d H:i',$v['cdate']);
+				// foreach ($res as $a => $b) {
+					// $data[$k]['leixing'] = $b;
+					$member_goods_name = '';
+					if (isset($v['name']) && $v['name']) {
+						$member_goods_name = $v['name'];
+					}
+					$total_num = '';
+					if(isset($v['total_num']) && $v['total_num']) {
+						$total_num = $v['total_num'];
+					}
+					$price = '';
+					if (isset($v['price']) && $v['price']) {
+						$price = $v['price'];
+					}
+		            $cash = '';
+		            if (isset($v['cash']) && $v['cash']) {
+		            	$cash = $v['cash'];
 		            }
-					$member_name = $member['name'];
-					$member_mobile = $member['mobile'];
-					$role = Dever::db('setting/role')->find($member['role']);
-					if ($role) {
-						$role_name = $role['name'];
+		            $role_name = '';
+					$member_name = '';
+					$member_mobile = '';
+					$member_cdate = '-';
+					$member = Dever::db('agent/member')->find($v['mid']);
+					if ($member) {
+			            if($member['cdate']){
+			                $member_cdate = date('Y-m-d H:i',$member['cdate']);
+			            }
+						$member_name = $member['name'];
+						$member_mobile = $member['mobile'];
+						$role = Dever::db('setting/role')->find($member['role']);
+						if ($role) {
+							$role_name = $role['name'];
+						}
 					}
-				}
-				$card = '';
-				$youxiao = '';
-				if ($v['type'] == 2){
-	                $code = Dever::db('card/code')->find($v['sku_id']);
-	                if($code){
-	                    $card_info = Dever::db('card/info')->find($code['card_id']);
-	                    if ($card_info && $card_info['end_dh_day']) {
-	                        $youxiao = date('Y-m-d H:i',strtotime(+ $card_info['end_dh_day'].'day',$code['bdate']));
-	                    }
-	                    $card = $code['card']."\t";
-	                }                  
-	            }
-	            $desc = '';
-	            $member_goods_log = Dever::db('agent/member_goods_log')->getOne(array('type'=>$v['type'],'type_id'=>$v['type_id'],'sku_id'=>$v['sku_id'],'state'=>1));
-	            if($member_goods_log && $member_goods_log['desc']){
-	                $desc = $member_goods_log['desc'];
-	            }
-	            $dui['mid'] = $v['mid'];
+					$card = '';
+					$youxiao = '';
+					if ($v['type'] == 2){
+		                $code = Dever::db('card/code')->find($v['sku_id']);
+		                if($code){
+		                    $card_info = Dever::db('card/info')->find($code['card_id']);
+		                    if ($card_info && $card_info['end_dh_day']) {
+		                        $youxiao = date('Y-m-d H:i',strtotime(+ $card_info['end_dh_day'].'day',$code['bdate']));
+		                    }
+		                    $card = $code['card']."\t";
+		                }                  
+		            }
+		            $desc = '';
+		            $member_goods_log = Dever::db('agent/member_goods_log')->getOne(array('type'=>$v['type'],'type_id'=>$v['type_id'],'sku_id'=>$v['sku_id'],'state'=>1));
+		            if($member_goods_log && $member_goods_log['desc']){
+		                $desc = $member_goods_log['desc'];
+		            }
+		            $dui['mid'] = $v['mid'];
 
-	            if (isset($where['start']) && $where['start']) {
-	            	$dui['start'] = $where['start'];
-	            }
-	            if (isset($where['end']) && $where['end']) {
-	            	$dui['end'] = $where['end'];
-	            }
-	            
-	            $dh_order_ps = Dever::db('agent/dh_order_ps')->getDui($dui);
-	            // echo Dever::sql();die;
+		            if (isset($where['start']) && $where['start']) {
+		            	$dui['start'] = $where['start'];
+		            }
+		            if (isset($where['end']) && $where['end']) {
+		            	$dui['end'] = $where['end'];
+		            }
+		            $dh_order_ps = Dever::db('agent/dh_order_ps')->getDui($dui);
 	            if ($where['types'] == 2 || $where['types'] == -1) {
+	            	// $v['leixing'] = ''
 	            	if ($dh_order_ps) {
-		            	$leixing = '兑换权益';
+		            	// $data[$k]['leixing'] = '兑换权益';
 		            	foreach ($dh_order_ps as $k =>$v) {
 		            		$dh_order = Dever::db('agent/dh_order')->find($v['order_id']);
 		            		if ($dh_order && isset($dh_order['info']) && $dh_order['info']){
@@ -622,7 +644,6 @@ Class Manage
 	            	if ($sell_order) {
 	            		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'];
@@ -633,7 +654,6 @@ Class Manage
 	            		}
 	            		
 	            	}
-	            	
 	            } else {
 	            	if (isset($v['sku_id']) && $v['sku_id']){
 	            		$w1['card_code_id'] = $v['sku_id'];
@@ -646,7 +666,6 @@ Class Manage
 	            		$sell_order = Dever::db('shop/sell_order')->getOutOne($w1);
 		            	if ($sell_order) {
 		            		if ($where['types'] == 3 || $where['types'] == -1) {
-		            			$leixing = '使用权益';
 			                	$w = $this->common($sell_order);
 			                	if ($w) {
 			                		$shop_name = $w['shop_name'];
@@ -658,37 +677,34 @@ Class Manage
 		                }
 	            	}
 	            }
-                if ($leixing) {
-                	$d = array
-	                (
-	                	$cdate,
-	                	$member_goods_name,
-	                	$role_name,
-	                	$member_name,
-	                	$member_mobile,
-	                	$card,
-	                	$leixing,
-	                	$total_num,
-	                	$price,
-			            $cash,
-			            $shop_type,
-			            $shop_sid,
-			            $shop_name,
-			            $order_num,
-			            $desc,
-		            	'',
-		            	$cdate,
-		                $member_cdate,
-		                $youxiao,
-	                );
-	               	$body[] = $d;
-                }
-                
-			}
-			
+	            $d = array
+                (
+                	$data[$k]['cdate'],
+                	$member_goods_name,
+                	$role_name,
+                	$member_name,
+                	$member_mobile,
+                	$card,
+                	$v['leixing'],
+                	$total_num,
+                	$price,
+		            $cash,
+		            $shop_type,
+		            $shop_sid,
+		            $shop_name,
+		            $order_num,
+		            $desc,
+	            	'',
+	            	$data[$k]['cdate'],
+	                $member_cdate,
+	                $youxiao,
+                );
+       			$body[] = $d;
+		}
+		if (!$body) {
+			Dever::alert('此时段没有数据,请重新选择条件');
 		}
 		$file = '代理商权益明细';
-				// Dever::input('excel_name');
         return Dever::excelExport($body, $header, $file);
 	}
 	public function common($sell_order)