浏览代码

amz和tt的拆单出现老客户的错误

lvhao 3 月之前
父节点
当前提交
60858894a7
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 2 1
      core/CoreApp/controllers/Fullorderamz.php
  2. 2 1
      core/CoreApp/controllers/Fullordertt.php

+ 2 - 1
core/CoreApp/controllers/Fullorderamz.php

@@ -472,7 +472,7 @@ class Fullorderamz extends Start_Controller {
 				$ud['address'] = str_replace("'","’",$ud['address']);
 				$ud['name'] = str_replace("'","’",$ud['name']);
 				$customer = $this->customeramz->get_email($ud['email'],$value['shop']);
-				$customernum = $this->fullorderamz->find_count("email = '".$ud['email']."' and shop = '".$value['shop']."'");
+				$customernum = $this->fullorderamz->find_count("email = '".$ud['email']."' and shop = '".$value['shop']."' and  extra_status = 0");
 				preg_match_all('/[0-9]/u',$ud['phone'],$result);
 				$numphone = join('',$result[0]);
 				$hmdaddress1 = str_replace(array(' parkway',' drive',' street',' road',' avenue',' boulevard',' alley',' court',' place',' lane',' manor',' terrace',' trail',' view',' cove'),array(' pkwy',' dr',' st',' rd',' av',' blvd',' aly',' ct',' pl',' ln',' mnr',' ter',' trl',' vw',' cv'),strtolower($ud['address']));
@@ -6324,6 +6324,7 @@ class Fullorderamz extends Start_Controller {
 			$data['budget'] = 0;
 			$data['shipremarks'] = '';
 			$data['source'] = 1;
+			$data['extra_status'] = 1;//拆分的订单
 			unset($data['id']);
 			unset($data['jweight']);
 			unset($data['fpcount']);

+ 2 - 1
core/CoreApp/controllers/Fullordertt.php

@@ -476,7 +476,7 @@ class Fullordertt extends Start_Controller {
 				$ud['address'] = str_replace("'","’",$ud['address']);
 				$ud['name'] = str_replace("'","’",$ud['name']);
 				$customer = $this->customertt->get_email($ud['email'],$value['shop']);
-				$customernum = $this->fullordertt->find_count("email = '".$ud['email']."' and shop = '".$value['shop']."'");
+				$customernum = $this->fullordertt->find_count("email = '".$ud['email']."' and shop = '".$value['shop']."'  and  extra_status = 0");
 				preg_match_all('/[0-9]/u',$ud['phone'],$result);
 				$numphone = join('',$result[0]);
 				$hmdaddress1 = str_replace(array(' parkway',' drive',' street',' road',' avenue',' boulevard',' alley',' court',' place',' lane',' manor',' terrace',' trail',' view',' cove'),array(' pkwy',' dr',' st',' rd',' av',' blvd',' aly',' ct',' pl',' ln',' mnr',' ter',' trl',' vw',' cv'),strtolower($ud['address']));
@@ -6414,6 +6414,7 @@ class Fullordertt extends Start_Controller {
 			$data['shipremarks'] = '';
 			$data['source'] = 1;
 			//$data['review'] = 2;
+			$data['extra_status'] = 1;//拆分的订单
 			unset($data['id']);
 			unset($data['jweight']);
 			unset($data['fpcount']);