平台订单导入优化细节，创建人、业务公司等

app/command/ImportOrderFromCHandleData.php

@@ -31,12 +31,13 @@ class ImportOrderFromCHandleData extends Command
     {
         $order_import_from_c_db = new OIFCModel();
 
-        $c_id = $order_import_from_c_db
+        $c_data = $order_import_from_c_db
             ->where(['is_del' => OIFCModel::$is_del_normal, 'status' => OIFCModel::$status_wait_relation])
             ->lock(true)
-            ->value('id', 0);
+            ->field('id,createrid,creater')
+            ->find();
 
-        if (!$c_id) $output->writeln('没有符合条件的记录');
+        if (empty($c_data)) $output->writeln('没有符合条件的记录');
         else {
 
             Db::startTrans();
@@ -44,11 +45,11 @@ class ImportOrderFromCHandleData extends Command
 
                 //先找用户确认信息
                 $extend_data = Db::name('order_import_from_c_extend')
-                    ->where(['order_import_from_c_id' => $c_id, 'is_del' => 0, 'type' => 2])
+                    ->where(['order_import_from_c_id' => $c_data['id'], 'is_del' => 0, 'type' => 2])
                     ->find();
                 if (empty($extend_data)) {
                     $extend_data = Db::name('order_import_from_c_extend')
-                        ->where(['order_import_from_c_id' => $c_id, 'is_del' => 0, 'type' => 1])
+                        ->where(['order_import_from_c_id' => $c_data['id'], 'is_del' => 0, 'type' => 1])
                         ->find();
                 }
 
@@ -72,7 +73,7 @@ class ImportOrderFromCHandleData extends Command
                 if ($supplier == false) throw new Exception('未找到平台供应商数据');
 
                 $goodtype = 1;//1正常商品
-                $order_type = 3;//1销售 2咨询 3平台(C端)导入
+
                 $sendtype = 1;//直接发货
                 $platform_id = $extend_data['platform_codes'];
 
@@ -91,6 +92,7 @@ class ImportOrderFromCHandleData extends Command
 
                 $goodinfo = $ct;
                 $is_stock = $ct['is_stock'];
+                $order_type = $is_stock == 1 ? 1 : 2;//1销售2咨询(1备库 2非库存 3咨询采反 4项目采反)
                 $spuCode = $ct['spuCode'];
                 $skuCode = $ct['skuCode'];
                 $is_activity = empty($extend_data['activity_name']) ? 0 : 1;
@@ -127,7 +129,7 @@ class ImportOrderFromCHandleData extends Command
                         $act = Db::name("activity_info")
                             ->alias("a")
                             ->leftJoin("good_activity b", "a.activity_code=b.activity_code")
-                            ->where(["a.skuCode" => $skuCode, "a.id" => $extend_data['activity_id'], "a.is_del" => 0, "a.status" => 1, "b.status" => 6, "b.is_del" => 0])
+                            ->where(["a.skuCode" => $skuCode, "a.activity_code" => $extend_data['activity_code'], "a.is_del" => 0, "a.status" => 1, "b.status" => 6, "b.is_del" => 0])
                             ->find();
                         if ($act == false) throw new Exception('未找到相关活动价');
                         if ($act['moq_num'] > $good_num) throw new Exception('商品不满足活动价起订量' . $act['moq_num']);
@@ -160,8 +162,8 @@ class ImportOrderFromCHandleData extends Command
 
                 $send_num = $extend_data['num'];
                 $remark = $extend_data['order_remark'];
-                $rm = $extend_data['createrid'];
-                $ri = $extend_data['creater'];
+                $rm = $c_data['createrid'];
+                $ri = $c_data['creater'];
                 $data = [
                     "orderCode" => $orderCode,
                     "good_code" => $spuCode,
@@ -185,7 +187,7 @@ class ImportOrderFromCHandleData extends Command
                     "send_status" => 1,
                     "good_type" => $goodtype,
                     "send_type" => $sendtype,
-                    "supplierNo" => $supplierNo,
+                    "supplierNo" => $extend_data['companyNo'],
                     "is_del" => 0,
                     "zxNo" => "",
                     "platform_order" => $platform_order,
@@ -214,7 +216,7 @@ class ImportOrderFromCHandleData extends Command
                             "updatetime" => date("Y-m-d H:i:s")
                         ];
                         $actupp = Db::name("activity_info")
-                            ->where(["skuCode" => $skuCode, "id" => $extend_data['activity_id'], "is_del" => 0, "status" => 1])
+                            ->where(["skuCode" => $skuCode, "activity_code" => $extend_data['activity_code'], "is_del" => 0, "status" => 1])
                             ->save($actup);
                         if ($actupp == false) throw new Exception('活动库存修改失败');
 
@@ -339,7 +341,7 @@ class ImportOrderFromCHandleData extends Command
 
                 //处理完成
                 $order_import_from_c_db
-                    ->where('id', $c_id)
+                    ->where('id', $c_data['id'])
                     ->save([
                         'status' => $order_import_from_c_db::$status_success,
                         'updatetime' => date('Y-m-d H:i:s'),
@@ -355,7 +357,7 @@ class ImportOrderFromCHandleData extends Command
             } catch (\think\Exception $exception) {
                 Db::rollback();
                 $order_import_from_c_db
-                    ->where('id', $c_id)
+                    ->where('id', $c_data['id'])
                     ->save([
                         'status' => $order_import_from_c_db::$status_stock_not_enough,
                         'updatetime' => date('Y-m-d H:i:s'),