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

app/shop/database/sell_order.php

@@ -1043,5 +1043,21 @@ return array
             'page' => array(20, 'list'),
             'col' => '*',
         ),
+        'getOutOne' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'shop_id' => 'yes',
+                'start' => array('yes-cdate', '>='),
+                'end' => array('yes-cdate', '<='),
+                'card_code_id' => 'yes',
+                'status' => array('yes', 'in'),
+                'state' => 1,
+            ),
+            'type' => 'one',
+            // 'page' => array(20, 'list'),
+            'col' => '*',
+        ),
     ),
 );

app/shop/lib/Sell.php

@@ -367,7 +367,7 @@ class Sell
             }
         }
 
-        if ($info['type'] == 10) {
+        if (isset($info['shop_id']) && $info['shop_id'] == 3) {
             $info['code'] = '';
         }
 

learn/active/lib/Manage.php

@@ -524,7 +524,10 @@ Class Manage
         $data = Dever::db('active/order')->find($order_id);
         $ids = $this->common($data,3,false,false,$price,$desc);
         if ($ids) {
-            Dever::db('active/info_refund_log')->insert($where);
+            $where['status'] = 2;
+            $where['id'] = $id;
+            Dever::db('active/info_refund_log')->update($where);
+            
             $admin = Dever::load('manage/auth.info');
             $w['where_id'] = $code_id;
             $w['status'] = 3;

service/agent/lib/Member.php

@@ -921,9 +921,17 @@ class Member
                 if ($member) {
                     $member_name = $member['name'];
                     $member_mobile = $member['mobile'];
+                    $prize_type = '';
                     if ($member['role']) {
                         $role = Dever::db('setting/role')->find($member['role']);
-                        $role_name = $role['name'];
+                        if ($role['id'] == 8) {
+                            if ($member['prize_type'] == 1) {
+                                $prize_type = '(名额外)';
+                            } elseif ($member['prize_type'] == 2) {
+                                $prize_type = '(名额内)';
+                            }
+                        }
+                        $role_name = $role['name'].$prize_type;
                     }
                 }
                 $shop_name = '';

tool/stats/lib/Manage.php

@@ -555,25 +555,28 @@ Class Manage
 	            if($member_goods_log && $member_goods_log['desc']){
 	                $desc = $member_goods_log['desc'];
 	            }
-	            $dh_order_ps = Dever::db('agent/dh_order_ps')->getDui($v['mid']);
+	            $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 ($where['types'] == 2 || $where['types'] == -1) {
 	            	if ($dh_order_ps) {
 		            	$leixing = '兑换权益';
 		            	foreach ($dh_order_ps as $k =>$v) {
-		            		$dh_order = Dever::db('agent/dh_order_ps')->find($v['order_id']);
+		            		$dh_order = Dever::db('agent/dh_order')->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 = '';
@@ -581,7 +584,14 @@ Class Manage
 	            $order_num = '';
 	            if (isset($where['shop_id']) && $where['shop_id']) {
 	            	$where['types'] = 3;
-	            	$sell_order = Dever::db('shop/sell_order')->find(array('shop_id'=>$where['shop_id']));
+	            	$w2['shop_id'] = $where['shop_id'];
+            		if (isset($where['start']) && $where['start']) {
+		            	$w2['start'] = $where['start'];
+		            }
+		            if (isset($where['end']) && $where['end']) {
+		            	$w2['end'] = $where['end'];
+		            }
+	            	$sell_order = Dever::db('shop/sell_order')->getOutOne($w2);
 	            	if ($sell_order) {
 	            		if ($where['types'] == 3 || $where['types'] == -1){
 	            			$w = $this->common($sell_order);
@@ -599,7 +609,14 @@ Class Manage
 	            	
 	            } else {
 	            	if (isset($v['sku_id']) && $v['sku_id']){
-	            		$sell_order = Dever::db('shop/sell_order')->find(array('card_code_id'=>$v['sku_id']));
+	            		$w1['card_code_id'] = $v['sku_id'];
+	            		if (isset($where['start']) && $where['start']) {
+			            	$w1['start'] = $where['start'];
+			            }
+			            if (isset($where['end']) && $where['end']) {
+			            	$w1['end'] = $where['end'];
+			            }
+	            		$sell_order = Dever::db('shop/sell_order')->getOutOne($w1);
 		            	if ($sell_order) {
 		            		if ($where['types'] == 3 || $where['types'] == -1) {
 		            			$leixing = '使用权益';