wugg 7 місяців тому
батько
коміт
f0d60f9802
2 змінених файлів з 5 додано та 5 видалено
  1. 3 3
      app/admin/controller/Goodup.php
  2. 2 2
      app/admin/controller/Sale.php

+ 3 - 3
app/admin/controller/Goodup.php

@@ -800,7 +800,7 @@ class Goodup extends Base
 				if($isCombind==1 && !empty($dchild)){
 					 (new GoodCombind())->saveAll($dchild);
 				}
-				if($open_type==1){
+				if($open_type==1||$tax_id>0){
 				    $data = [
 				        'spuCode'=>$spucode,
 				        'open_type'=>$open_type,
@@ -1141,7 +1141,7 @@ class Goodup extends Base
 			if($isCombind==1 && !empty($dchild)){
 					 (new GoodCombind())->saveAll($dchild);
 			}
-			if($open_type==1){
+			if($open_type==1||$tax_id>0){
 			    $taxInfo = GoodTax::where('spuCode',$supcode)->findOrEmpty();
 			    $taxInfo->spuCode = $supcode;
 			    $taxInfo->companyNo = $company_id;
@@ -2697,7 +2697,7 @@ class Goodup extends Base
 				if($isCombind==1 && !empty($dchild)){
 					 (new GoodCombind())->saveAll($dchild);
 			    }
-                if($open_type==1){
+                if($open_type==1||$tax_id>0){
                     $taxInfo = GoodTax::where('spuCode',$supcode)->findOrEmpty();
                     $taxInfo->spuCode = $supcode;
                     $taxInfo->companyNo = $company_id;

+ 2 - 2
app/admin/controller/Sale.php

@@ -1225,7 +1225,7 @@ class Sale extends Base
                 		];
                 	(new ConsultTemp())->CreateGood($zxinfo['bidNo'],$marage);
                 }
-                if($zxinfo['open_type']==1){
+                if($zxinfo['open_type']==1|| $zxinfo['tax_id']>0){
                      $data = [
 				        'spuCode'=>$zxinfo['spuCode'],
 				        'companyNo'=>$companyNo,
@@ -1825,7 +1825,7 @@ class Sale extends Base
                 		];
                 	(new ConsultTemp())->CreateGood($goodinfo['bidNo'],$marage);
                 }
-            if($goodinfo['open_type']==1){
+            if($goodinfo['open_type']==1|| $goodinfo['tax_id']>0){
                                  $data = [
             				        'spuCode'=>$goodinfo['spuCode'],
             				        'companyNo'=>$data['companyNo'],