全局再搜索order_type

app/abutment/controller/Order.php

@@ -947,7 +947,7 @@ class Order extends HomeBaseController
 
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3||$value['order_type'] == 4) {
                 $temp = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit,tax')

app/abutment/controller/Sale.php

@@ -162,7 +162,7 @@ class Sale extends HomeBaseController
             return json_show(1002, "未找到出库数据");
         }
         $item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
-        if ($item['order_type'] == 3) {
+        if ($item['order_type'] == 3||$item['order_type'] == 4) {
             $goodinfo = Db::name("good_zixun")->where(["spuCode" => $item['good_code'], "is_del" => 0])->find();
             if ($goodinfo == false) {
                 return json_show(1004, "未找到商品数据");
@@ -643,7 +643,7 @@ class Sale extends HomeBaseController
 
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3) {
+            if ($value['order_type'] == 3||$value['order_type'] == 4) {
                 $temp = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit')
@@ -707,7 +707,7 @@ class Sale extends HomeBaseController
             return json_show(1002, "未找到出库数据");
         }
         $item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
-        if ($item['order_type'] == 3) {
+        if ($item['order_type'] == 3||$item['order_type'] == 4) {
             $goodinfo = Db::name("good_zixun")->where(["spuCode" => $item['good_code'], "is_del" => 0])->find();
             if ($goodinfo == false) {
                 return json_show(1004, "未找到商品数据");

app/admin/controller/Reorder.php

@@ -36,7 +36,7 @@ class Reorder extends Base
         if($retrun>0){
             return error_show(1005,"存在未完成退货订单数据");
         }
-        if($order['order_type']==3){
+        if($order['order_type']==3||$order['order_type']==4){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$order['good_code'],"is_del"=>0])->find();
         }else {
             $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -517,7 +517,7 @@ class Reorder extends Base
            return error_show(1004,"未找到退货数据");
        }
        $orderinfo = Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
-        if($orderinfo['order_type']==3){
+        if($orderinfo['order_type']==3||$orderinfo['order_type']==4){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
 
         }else {

app/command/NowReportHandle.php

@@ -832,7 +832,7 @@ class NowReportHandle extends Command
              $value['一级分类'] = isset($cat[0]['name']) ? $cat[0]['name'] : "";
              $value['二级分类'] = isset($cat[1]['name']) ? $cat[1]['name'] : "";
              $value['三级分类'] = isset($cat[2]['name']) ? $cat[2]['name'] : "";
-			if($value["order_type"]==3){
+			if($value["order_type"]==3||$value["order_type"]==4){
 				$good =Db::name("good_zixun")->where(["spuCode"=>$value['商品编号']])->find();
 			}else{
 				$good =Db::name("good")->where(["spuCode"=>$value['商品编号']])->find();