Browse Source

平台订单导入优化

wufeng 2 years ago
parent
commit
069dc5ffff

+ 4 - 4
app/command/ImportOrderFromCAnalysisData.php

@@ -135,16 +135,16 @@ class ImportOrderFromCAnalysisData extends Command
             $extend_insert_data['mode'] = in_array($rs['mode'], ['卡券支付', '现金支付', '混合支付']) ? $rs['mode'] : '';
 
             //企业客户
-            $co_id = Db::name('good_platform')
+            $co = Db::name('good_platform')
                 ->alias('gp')
                 ->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
                 ->leftJoin('customer_org1 co', 'co.name=p.platform_name AND co.is_del=0')
                 ->where('gp.plat_code', $rs['plat_code'])
-                ->value('co.id', 0);
+                ->field('co.id,co.name')->find();
 
-            if ($co_id) {
+            if ($co) {
                 $customer_code = Db::name('customer_info')
-                    ->where(['itemid' => $co_id, 'companyName' => '客户', 'is_del' => 0])
+                    ->where(['itemid' => $co['id'], 'companyName' => $co['name'] . '客户', 'is_del' => 0])
                     ->value('companyNo', '');
 
                 if ($customer_code) $extend_insert_data['customer_code'] = $customer_code;

+ 2 - 2
app/command/ImportOrderFromCHandleData.php

@@ -44,11 +44,11 @@ class ImportOrderFromCHandleData extends Command
 
                 //先找用户确认信息
                 $extend_data = Db::name('order_import_from_c_extend')
-                    ->where(['order_import_from_c_id' => $c_id['id'], 'is_del' => 0, 'type' => 2])
+                    ->where(['order_import_from_c_id' => $c_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['id'], 'is_del' => 0, 'type' => 1])
+                        ->where(['order_import_from_c_id' => $c_id, 'is_del' => 0, 'type' => 1])
                         ->find();
                 }