关于用户的老客户

core/CoreApp/controllers/Customer.php

@@ -1668,6 +1668,7 @@ class Customer extends Start_Controller {
 					}
 				}
 			}	
+			
 			/*  匹配ID结束  */
 		    $this->db->trans_begin();
 		    foreach ($list as $key=>$value)
@@ -2155,7 +2156,7 @@ class Customer extends Start_Controller {
 				$fdata = $this->customer->find_all($where.$wid,'email,shop','time desc');
 				foreach ($fdata as $key=>$value) 
 		        {
-					$d = $this->fullorder->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0','orderinfo,state,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');
+					$d = $this->fullorder->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0    and  extra_status = 0 ','orderinfo,state,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');
 					if($nu == 2)
 					{
 					    if(count($d) > 1)

core/CoreApp/controllers/Customertt.php

@@ -1876,7 +1876,7 @@ class customertt extends Start_Controller {
 				$fdata = $this->customertt->find_all($where.$wid,'email,shop','time desc');
 				foreach ($fdata as $key=>$value) 
 		        {
-					$d = $this->fullordertt->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0','orderinfo,state,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');
+					$d = $this->fullordertt->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0   and  extra_status = 0 ','orderinfo,state,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');
 					if($nu == 2)
 					{
 					    if(count($d) > 1)