订单导入用户编辑优化

app/admin/controller/OrderImport.php

@@ -156,6 +156,7 @@ class OrderImport extends Base
             'price',
             'num',
             'before_discount_all_price',
+            'activity_id',
             'activity_name',
             'mode',
             'order_remark',
@@ -223,6 +224,7 @@ class OrderImport extends Base
                 ->insert([
                     'order_import_from_c_id' => $param['id'],
                     'addr_code' => $param['addr_code'],
+                    'activity_id' => $param['activity_id'],
                     'addtime' => date('Y-m-d H:i:s'),
                     'createrid' => isset($user["data"]['id']) ? $userinfo["data"]['id'] : 0,
                     'creater' => isset($user["data"]['nickname']) ? $userinfo["data"]['nickname'] : '',
@@ -260,7 +262,6 @@ class OrderImport extends Base
     }
 
 
-
     //【脚本2】批量处理导入的数据
     public function analysisBatchDataBySystem2222()
     {
@@ -493,69 +494,5 @@ class OrderImport extends Base
 
     }
 
-    //处理库存(关联库存)
-    public function handleStock(array $da = [])
-    {
-    }
-
-    //C端订单导入成功后，生成销售单
-    private function createSaleByImportSuccess(array $goodinfo = [], array $c_data = [], array $extend_data = []): string
-    {
-        $orderCode = makeNo("QR");
-
-        $sale_insert_data = [
-            "orderCode" => $orderCode,
-            "good_code" => $goodinfo['good_code'],
-            "customer_code" => $customer_code,
-            "good_name" => $goodinfo['good_name'],
-            "good_num" => $c_data['num'],
-            "cat_id" => $goodinfo['cat_id'],
-            "apply_id" => $c_data['createrid'],
-            "apply_name" => $c_data['creater'],
-            "origin_price" => $c_data['price'] * $c_data['num'],
-            "sale_price" => $goodinfo['sale_price'],
-            "post_fee" => 0,
-            "status" => 0,
-            "send_num" => 0,
-            "wsend_num" => $c_data['num'],
-            "send_status" => 1,
-            "good_type" => 1,
-            "send_type" => 1,//发货类型 1直接发货2延时发货
-            "supplierNo" => $extend_data['supplierNo'],
-            "is_del" => 0,
-            "zxNo" => '',
-            "platform_order" => $platform_order,
-            "platform_id" => $extend_data['platform_codes'],
-            "remark" => $c_data['order_remark'],
-            "order_type" => 3,//订单类型1销售2咨询3C端导入
-            "addtime" => date("Y-m-d H:i:s"),
-            "updatetime" => date("Y-m-d H:i:s"),
-            'total_price' => round($goodinfo['sale_price'] * $c_data['num'], 2),
-        ];
-
-        $res = Db::name('sale')->insertGetId($sale_insert_data);
-
-        if ($res) {
-
-            //修改状态，添加待办,脚本执行，没有token
-//            ActionLog::logAdd($this->post['token'], [
-//                "order_code" => $orderCode,//销售单code
-//                "status" => 0,//这里的status是之前的值
-//                "action_remark" => '',//备注
-//                "action_type" => "create"//新建create，编辑edit，更改状态status
-//            ], "XSQRD", 0, $sale_insert_data);
-//
-//            ProcessOrder::AddProcess($this->post['token'], [
-//                "order_type" => 'XSQRD',
-//                "order_code" => $orderCode,//销售单code
-//                "order_id" => $res,
-//                "order_status" => 0
-//            ]);
-
-            return $orderCode;
-
-        } else throw new \think\Exception('创建销售单失败');
-    }
-
 
 }

app/command/ImportOrderFromC.php → app/command/ImportOrderFromCAnalysisData.php

@@ -12,8 +12,8 @@ use think\console\Output;
 use think\facade\Db;
 use think\facade\Validate;
 
-//C端订单导入
-class ImportOrderFromC extends Command
+//C端订单导入-数据解析
+class ImportOrderFromCAnalysisData extends Command
 {
     protected function configure()
     {
@@ -37,12 +37,9 @@ class ImportOrderFromC extends Command
 //        $customer_info_db = Db::name('customer_info')->field('companyNo')->where(['is_del' => 0]);
 
             $rs = $order_import_from_c_db
-                ->where([
-                    'is_del' => OIFCModel::$is_del_normal,
-                    'status' => OIFCModel::$status_wait_validate
-                ])->find();
-
-            //加写锁
+                ->where(['is_del' => OIFCModel::$is_del_normal, 'status' => OIFCModel::$status_wait_validate])
+                ->lock(true)
+                ->find();
 
             //1.数据校验
             $val = Validate::rule([
@@ -102,6 +99,10 @@ class ImportOrderFromC extends Command
                 $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',在商品平台表中查不到平台商品编号对应的spuCode' : '在商品平台表中查不到平台商品编号对应的spuCode';
             }
 
+            $extend_insert_data['activity_id'] = Db::name('good_activity')
+                ->where(['activity_name' => $rs['activity_name'], 'is_del' => 0])
+                ->value('id');
+
             $order_import_from_c_extend_db->insertGetId($extend_insert_data);
 
             if (!isset($update_c_data['status'])) $update_c_data['status'] = OIFCModel::$status_wait_relation;