订单导入处理的脚本优化括号

app/command/ImportOrderFromCHandleData.php

@@ -7,7 +7,8 @@ use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
 use app\admin\model\GoodStockInfo;
 use app\admin\model\OrderImportFromC as OIFCModel;
-use app\admin\model\OrderOutChild;use app\admin\model\ProcessOrder;
+use app\admin\model\OrderOutChild;
+use app\admin\model\ProcessOrder;
 use app\admin\model\Test1;
 use think\console\Command;
 use think\console\Input;
@@ -132,10 +133,10 @@ class ImportOrderFromCHandleData extends Command
 //			            ->leftJoin("good_stock_info c", "a.id=c.stockid and c.balance_num>0")
 //			            ->where(["spuCode" => $spuCode, "a.is_del" => 0, "a.status" => 1, "b.wsm_type" => 5, "b.companyNo" =>$supplierNo])
 //			            ->sum('balance_num');
-			            if($ct['usable_stock'] < $good_num){
-			               throw new Exception('商品库存数量不足');
-			            }
-                        $origin_price = 0;
+                    if ($ct['usable_stock'] < $good_num) {
+                        throw new Exception('商品库存数量不足');
+                    }
+                    $origin_price = 0;
 
                 } else {
 
@@ -314,40 +315,40 @@ class ImportOrderFromCHandleData extends Command
 
                     } else {
                         //库存品
-	                        $stockUp =[
-		                        "usable_stock"=>$ct['usable_stock']-$good_num,
-		                        "updatetime"=>date("Y-m-d H:i:s"),
-		                        ];
-	                        $update=Db::name("good")->where(["spuCode"=>$ct['spuCode'],"usable_stock"=>$ct['usable_stock']])->update($stockUp);
-                            if($update==false){
-	                             throw new Exception('商品更新可用库存失败');
-	                        }
-
+                        $stockUp = [
+                            "usable_stock" => $ct['usable_stock'] - $good_num,
+                            "updatetime" => date("Y-m-d H:i:s"),
+                        ];
+                        $update = Db::name("good")->where(["spuCode" => $ct['spuCode'], "usable_stock" => $ct['usable_stock']])->update($stockUp);
+                        if ($update == false) {
+                            throw new Exception('商品更新可用库存失败');
                         }
-                        if ($sendtype == 1) {
-                            $temp = [
-                                'orderCode' => $orderCode,
-                                'contactor' => $extend_data['contactor'],
-                                'mobile' => $extend_data['mobile'],
-                                'addr' => $extend_data['addr'],
-                                'addr_code' => $extend_data['addr_code'],
-                                'customer_code' => $customer_code,
-                                'receipt_quantity' => $extend_data['num'],//收货数量,
-                                'post_fee' => 0,
-                                'is_del' => 0,
-                                'addtime' => date("Y-m-d H:i:s"),
-                                'updatetime' => date("Y-m-d H:i:s"),
-                                'arrive_time' => $arrtime,
-                            ];
-                            $vmp = Db::name('order_addr')->insert($temp, true);
-                            if ($vmp > 0) {
-                            	 $num = $extend_data['num'];
-                                $outCode = makeNo("DF");
-                            	if($is_stock!=1){
-	                                    $order = Db::name("order_num")
-	                                    ->where(["orderCode" => $orderCode, "status" => 1])
-	                                    ->find();
-	                                if ($order == false) throw new Exception('未找到可以发货得采购单数据');
+
+                    }
+                    if ($sendtype == 1) {
+                        $temp = [
+                            'orderCode' => $orderCode,
+                            'contactor' => $extend_data['contactor'],
+                            'mobile' => $extend_data['mobile'],
+                            'addr' => $extend_data['addr'],
+                            'addr_code' => $extend_data['addr_code'],
+                            'customer_code' => $customer_code,
+                            'receipt_quantity' => $extend_data['num'],//收货数量,
+                            'post_fee' => 0,
+                            'is_del' => 0,
+                            'addtime' => date("Y-m-d H:i:s"),
+                            'updatetime' => date("Y-m-d H:i:s"),
+                            'arrive_time' => $arrtime,
+                        ];
+                        $vmp = Db::name('order_addr')->insert($temp, true);
+                        if ($vmp > 0) {
+                            $num = $extend_data['num'];
+                            $outCode = makeNo("DF");
+                            if ($is_stock != 1) {
+                                $order = Db::name("order_num")
+                                    ->where(["orderCode" => $orderCode, "status" => 1])
+                                    ->find();
+                                if ($order == false) throw new Exception('未找到可以发货得采购单数据');
                                 $tep = [
                                     "cgdNo" => $order['cgdNo'],
                                     "outCode" => $outCode,
@@ -356,19 +357,19 @@ class ImportOrderFromCHandleData extends Command
                                     "addtime" => date("Y-m-d H:i:s"),
                                     "updatetime" => date("Y-m-d H:i:s")
                                 ];
-                                $ou = Db::name("order_out")->insertGetId($out);
+                                $ou = Db::name("order_send")->insertGetId($tep);
                                 if ($ou == false) throw new Exception('发货地址添加创建失败');
-                                else {
-                                	OrderOutChild::makeChild($outCode);
-                                	    //修改状态，添加待办
-                                	    if ($is_stock==1){
-                                	    	$roleid = Config('app.wsm_cgder_role');
-		                            $uids = Db::name('user_role')
-		                                ->where('is_del', 0)
-		                                ->whereIn('roleid', $roleid)
-		                                ->column('uid');
-		                            $handle_user_list=implode(',', $uids);
-                                	    }
+//                                else {
+//                                	OrderOutChild::makeChild($outCode);
+//                                	    //修改状态，添加待办
+//                                    if ($is_stock == 1) {
+//                                        $roleid = Config('app.wsm_cgder_role');
+//                                        $uids = Db::name('user_role')
+//                                            ->where('is_del', 0)
+//                                            ->whereIn('roleid', $roleid)
+//                                            ->column('uid');
+//                                        $handle_user_list = implode(',', $uids);
+//                                    }
 
                                 $cgdinfo = Db::name("purchease_order")->where(["cgdNo" => $order['cgdNo']])->find();
                                 if ($cgdinfo == false) throw new Exception('未匹配到采购数据');